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