Merge "Fix recursive lock in X509_PUBKEY_get"