Merge branch '2.2.x' of github.com:grails/grails-core into 2.2.x
change to batch add all mocked entities in one go
fix failing test, by initializing mapping context before enhancing domain
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'