Merge "OpenJDK11: merge java.security.Keystore classes."