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'