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