Merge "java.security: update java.security.KeyStore to jdk8u60"