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