Merge "Fix disable_ssl_certificate_validation values if ca_certificates file is defined"