Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml

Author: wilkinsona

spring-boot-dependencies/pom.xml

@@ -64,7 +64,7 @@
 		<gemfire.version>7.0.2</gemfire.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<gradle.version>1.6</gradle.version>
-		<groovy.version>2.3.7</groovy.version>
+		<groovy.version>2.3.8</groovy.version>
 		<gson.version>2.3</gson.version>
 		<h2.version>1.4.182</h2.version>
 		<hamcrest.version>1.3</hamcrest.version>