update datastore version to 1.1.7 RELEASE
Merge branch '2.1.x' into 2.2.x
Grails batch file fix for windows environemnt.

Signed-off-by: Jeff Brown <jbrown@vmware.com>
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'

Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java