Merge branch '2.3.x' into 2.4.x

Conflicts:
	gradle/assemble.gradle
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy

Author: lhotari

build.gradle

@@ -29,7 +29,7 @@ ext {
     commonsCollectionsVersion = "3.2.1"
     commonsIOVersion = "2.2"
     commonsLangVersion = "2.6"
-    datastoreVersion = "3.1.3.BUILD-SNAPSHOT"
+    datastoreVersion = "3.1.3.RELEASE"
     gantVersion = "1.9.6"
     gdocEngineVersion = "1.0.1"
     groovyVersion = "2.3.7"