Merge "OpenJDK11: fix SocketOptions test which had args[] left in."