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
fix for GRAILS-9813 "Domain.getAll( ['id1','id2'] ) not working : returns null"
Merge branch '2.1.x' into 2.2.x
Revert "fix for GRAILS-9813 "Domain.getAll( ['id1','id2'] ) not working : returns null""

This reverts commit bd6f6cb9939de3a058fc152eb783ec63b4c4e871.
Merge branch '2.1.x' into 2.2.x
auto-annotate setUp / tearDown methods even if only @TestMixin annotation is used
Merge branch '2.1.x' into 2.2.x
Changes to support fix for GRAILS-9637 "Grails Unit Tests using the new Annotation framework is slow". Need verification of improvements.
removed dated test that is covered elsewhere by existing coverage
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
only use mavenLocal() for non-CI builds
Merge branch '2.1.x' into 2.2.x
use groovy 2.0.7
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
change to batch add all mocked entities in one go