fix for GRAILS-9795 "LazyMetaPropertyMap putAll doesn't work"
Merge branch '2.1.x' into 2.2.x
fix for GRAILS-8736 "Failed Assume crashes Grails unit test"
Merge branch '2.1.x' into 2.2.x