Fix typo in java.version ref
Merge branch 'master' into MR1