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
Merge branch '2.2.x'

Conflicts:
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
	grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/spring/GrailsRuntimeConfiguratorTests.java