Merge "java.security.Provider: port to jdk8u60 (second part)"