rewrite test

This fixes a problem with the JDK8 + Groovy 2.3 build

Conflicts:
	grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/mime/ContentFormatControllerTests.groovy
Merge branch 'master' into groovy_2.3_jdk8