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