Improve tests to use Grails app testing support
Merge branch '2.2.x'

Conflicts:
	grails-plugin-controllers/src/test/groovy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformerCommandObjectSpec.groovy
GRAILS-6710 - restore test