fix for GRAILS-9856 "Forked mode test-app broken: java.lang.ClassNotFoundException: sun.tools.native2ascii.Main"
fix for GRAILS-9273 "DirectoryWatcher: files are incorrectly considered "new" if their extension wasn't watched for that directory"
fix for GRAILS-8072 "Improve default toString() output for domain classes"
fix for GRAILS-9726 "Plugin resolution occasionally removes necessary plugins due to similarly named inline-plugins"
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/PluginInstallEngine.groovy
Merge branch '2.2.x'

Conflicts:
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/PluginInstallEngine.groovy
Revert "upgrade to Groovy 1.8.9"

This reverts commit e4013a7bcc3718f46d8707d13fd44e8e2264e921.
Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
Merge branch '2.2.x'
remove @Override from some interface method impls
moved some tests to g-t-s-u
GRAILS-8733: Switched order of years by default for datePicker tag
Merge pull request #333 from bobbywarner/GRAILS-8733

GRAILS-8733: Switched order of years by default for datePicker tag