fix compilation errors
Merge branch 'master' of github.com:grails/grails-core

Conflicts:
	grails-web-boot/src/test/groovy/grails/boot/EmbeddedContainerWithGrailsSpec.groovy
	grails-web-boot/src/test/groovy/grails/boot/GrailsSpringApplicationSpec.groovy