use aspectj version 1.8.1
- spring-aop 4.0.6.RELEASE uses 1.8.1 version
GRAILS-11574 Add support for LocaleResolver in unit tests
Merge branch '2.3.x' into 2.4.x

Conflicts:
	grails-plugin-testing/src/main/groovy/grails/test/mixin/web/ControllerUnitTestMixin.groovy
GRAILS-11574 Add support for LocaleResolver in unit tests (Grails 2.4.x)
Merge branch '2.4.x'

Conflicts:
	build.gradle
	grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy
Merge remote-tracking branch 'origin/master'