fix failing tests
fix for GRAILS-9023 "@TestFor doesn't work when test class doesn't end with Tests"
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'
fix for GRAILS-9723 "--nojars stopped working (jars are included)"
Merge branch '2.2.x'
improve detection of possible JUnit 4 tests
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-plugin-testing/src/test/groovy/grails/test/mixin/TestForSpec.groovy
Merge branch '2.2.x'
Merge branch 'master' of github.com:grails/grails-core