Merge "OpenJDK 11: Merging java.security.* trivial changes"