Merge "OpenJDK17: further sun.nio.ch changes"