fix precompiled GSPs not working in built JAR/WAR file due to issues with isWarDeployed()
Merge branch 'master' of github.com:grails/grails-core

Conflicts:
	grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy