fix for GRAILS-9980 "In unit tests, make beans available in Grails mainContext"
Merge branch '2.1.x' into 2.2.x