Merge "Changes for OpenJDK 11"

No match.