Test tools/launcher/VersionCheck.java fails with jigsaw/m2 builds on Windows
Minor clean-up based on review comments
Fix merge mistakes
Merge from 'jdk'