Fix issue where calling validate() after a domain class is reloaded with hibernate.reload = false causes NPE
Merge pull request #336 from longwa/GRAILS-9412

Fix issue where calling validate() after a domain class is reloaded with...
GRAILS-9926 upgrade release plugin to a version that is updated to work with "legacyResolve false"
Merge pull request #338 from rlovtangen/GRAILS-9926

GRAILS-9926 upgrade release plugin to a version that is updated to work ...
Revert "Revert "upgrade Groovy version to 2.1.2""

This reverts commit 1b8721659251bd83310d942d1a266263b1aec753.
GRAILS-9880 fixed wrong property name
GRAILS-9742 switched back to URLEncoder with special handling for + and %20
test fix
GRAILS-9923 removed use of withDefault
added error handling for malformed tokens
Merge branch 'master' of github.com:grails/grails-core
fix for GRAILS-9898 "can't reload i18n messages in run-app"
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'

Conflicts:
	grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/DirectoryWatcher.java
	grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/Identity.groovy
	grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/plugins/orm/hibernate/HibernatePluginSupport.groovy
	grails-plugin-url-mappings/src/main/groovy/org/codehaus/groovy/grails/web/mapping/RegexUrlMapping.java
	grails-resources/src/grails/plugin/grails-app/conf/BuildConfig.groovy
	grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/mapping/RegexUrlMappingTests.groovy
	grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/ApplicationTagLibTests.groovy
	grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/SynchronizerTokensHolder.groovy