Merge "OpenJDK 11: Merging in java.io.OutputStream"