Merge "Deprecate non-X509Certificate SslCertificate constructors"