GRAILS-10032 - Clarify that a JDK is required
Merge branch '2.1.x' into 2.2.x