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