update to 2.1.5 build snapshot and 1.1.7 snapshot version of datastore which fixes GRAILS-9882
Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
fix for GRAILS-6813 "character encoding problem with message.properties in plugins"
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-core/src/main/groovy/org/codehaus/groovy/grails/context/support/PluginAwareResourceBundleMessageSource.java
	grails-plugin-i18n/src/main/groovy/org/codehaus/groovy/grails/plugins/i18n/I18nGrailsPlugin.groovy
Merge branch '2.2.x'

Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
	grails-core/src/main/groovy/org/codehaus/groovy/grails/context/support/PluginAwareResourceBundleMessageSource.java
	grails-plugin-i18n/src/main/groovy/org/codehaus/groovy/grails/plugins/i18n/I18nGrailsPlugin.groovy