Merge "Port sun.security.x509* changes from openJdk8u121-b13"