Changed the JDK version property so that there is no point in the classifier.
Merge branch 'master' into enterprise