fix for GRAILS-9939 "Transitive JAR dependencies of in-place plugins not found"
GRAILS-5994 - allow url mappings to specify a redirect
Make @TestMixin also auto add the @Test annotation to test methods for JUnit 4 tests
Merge branch 'master' of github.com:grails/grails-core
fix functional tests
fix test
Fix for GRAILS-10291 "Method name must not be null" exception when using custom onUnauthorized method in grails-shiro plugin's ShiroSecurityFilters which calls filter.forward rather than filter.redirect"
Fix for GRAILS-9426: Wrong plugin load ordering
Merge pull request #382 from mhurne/2.2.x

Fix for GRAILS-10291 "Method name must not be null" exception when using...
fix failing test
Merge branch '2.2.x'

Conflicts:
	grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
whitespace, cleanup
GRAILS-8917 if nothing is returned from a controller action, use an empty model, not the properties of the controller instance