Fix a typo and remove some trailing whitespace
Extend Java version information
relax java.version parsing test, print actual results when they're unexpected
only major/minor/incremental is okay when parsing java.version