Merge "More sun.security.* patches from OpenJDK8u121-b13"