restoring GrailsASTUtils.THIS_EXPR for now as it is referred to by grails-data-mapping
Merge branch '2.3.x'