Merge "Cinder client does not honor disable_ssl_certificate_validation"