auto-annotate setUp / tearDown methods even if only @TestMixin annotation is used
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'
update .gitignore
remove @Override from some interface method impls
GRAILS-9843 changed create-script to generate a unique target name based on class name
GRAILS-9844 create-script now creates a cli test
Minimal suport to enable forked mode debugging in GGTS.
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
Merge pull request #331 from kdvolder/sts-debug-forked-support

Minimal suport to enable forked mode debugging in GGTS.
only use mavenLocal() for non-CI builds
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'
use groovy 2.0.7
Merge branch '2.2.x'

Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
fix failing test
Merge branch '2.1.x' into 2.2.x