GRAILS-11492 - make the tests 1.6 compatible
Merge branch '2.3.x' into 2.4.x