remove deprecated statics
Merge branch 'master' of github.com:grails/grails-core
introduce LegacyGrailsApplication to ease migration, fix failing tests
remove dependency on commons file upload from ControllerTestPlugin
remove deprecated unit test hierarchy
fix failing tests
fix failing tests
Merge branch 'master' of github.com:grails/grails-core

Conflicts:
	grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/servlet/mvc/TagLibDynamicMethodsTests.groovy