use resources plugin version 1.2.12
use resources plugin 1.2.13
Separate options from arguments when calling cygpath

Calling `grails run --stacktrace` throws an error when startGrails is attempting to convert the arguments to a windows format.  By using a `--`, we separate the options to cygpath from the arguments cygpath tries to convert.
Merge branch '2.3.x' into 2.4.x

Conflicts:
	gradle/assemble.gradle
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
fix for GRAILS-7416 "switching the apps locale with ?lang=XX Parameter is not working on the index.gsp page"
GRAILS-11790 Support per-instance DelegatingMetaClass instances in Grails
Merge branch '2.3.x' into 2.4.x
Merge branch '2.4.x'

Conflicts:
	grails-plugin-i18n/src/main/groovy/org/codehaus/groovy/grails/plugins/i18n/I18nGrailsPlugin.groovy
	grails-resources/src/grails/home/bash/startGrails
move test to relocated package