Merge "verifyCertificateChain should convert unknown exceptions to CertificateException"