Merge "Merge OpenJDK 8 java.net (part 2)"