fix tomcat version
Merge branch '2.1.x' into 2.2.x
GRAILS-10058 removed "file:" prefix that caused plugin i18n file lookup to fail
GRAILS-8063 - invoke beforeValidate() when ValidationSupport is used for validation
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-plugin-validation/src/main/groovy/org/codehaus/groovy/grails/web/plugins/support/ValidationSupport.groovy
Merge branch '2.2.x'

Conflicts:
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
	grails-plugin-validation/src/main/groovy/org/codehaus/groovy/grails/web/plugins/support/ValidationSupport.groovy