Merge "OpenJDK 11: Merging in java.net.URLEncoder and URLDecoder"