fix failing test
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x' of github.com:grails/grails-core into 2.2.x