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