fix for meta class changes from integration tests leaking into functional tests when running inline
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/spring/GrailsRuntimeConfigurator.java
Merge branch '2.2.x'

Conflicts:
	scripts/_GrailsTest.groovy
Merge branch 'master' of github.com:grails/grails-core