GRAILS-10301 - improve the handling of service bean aliases
GRAILS-10301 - was aliasing the wrong bean
GRAILS-10301 - fix failing functional test
GRAILS-10132 - fix command line handling of blanks in windows

This is still pending testing.
2.2.5.BUILD-SNAPSHOT
Merge branch '2.2.x'

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
GRAILS-10132 - fix command line handling of blanks in windows

This is still pending testing.
Merge branch '2.2.x'
Revert "GRAILS-10132 - fix command line handling of blanks in windows"

This reverts commit de110b271546754a9a8e500c94797bba58b1bd37.
Merge branch '2.2.x'
remove unused images left over from 1.x create-app

These should be removed because they are unneeded cruft that get copied over whenever anyone runs create-app
Merge pull request #384 from kenliu/remove-unused-create-app-imgs

remove unused images left over from 1.x create-app
Merge branch '2.2.x'