Merge "OpenJDK11: Merge additional KeyStore tests."