Merge "OpenJDK 11: Merge trivial changes for java.security.cert.*"