Port TLS-Client-Cert-X509v3* from "master" branch