Merge branch '2.2.x'

Conflicts:
	grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
increase memory for test suite
Merge branch 'master' of github.com:grails/grails-core