fix for GRAILS-10708
fix for GRAILS-10633
fix for compilation error in functional tests
Merge branch '2.3.x' of github.com:grails/grails-core into 2.3.x