Merge "OpenJDK 11: Merging java.util.* actually trivial changes"