Merge branch '2.2.x'

Conflicts:
	grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
bug fix
weave integration test mixin into integration tests automatically
update to Grails 2.3 RC1
increase memory for test suite
Merge branch 'master' of github.com:grails/grails-core
increase memory for test suite
update to datastore RC1
Merge branch 'master' of github.com:grails/grails-core
set version to 2.2.4
Merge branch '2.2.x'

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-persistence/build.gradle
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
GRAILS-10266 create the history file if it doesn't exist
updated hibernate plugin versions
Merge branch '2.2.x'