Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml

Author: wilkinsona

spring-boot-dependencies/pom.xml

@@ -59,7 +59,7 @@
 		<commons-digester.version>2.1</commons-digester.version>
 		<commons-pool.version>1.6</commons-pool.version>
 		<commons-pool2.version>2.2</commons-pool2.version>
-		<crashub.version>1.3.0</crashub.version>
+		<crashub.version>1.3.1</crashub.version>
 		<dropwizard-metrics.version>3.1.0</dropwizard-metrics.version>
 		<flyway.version>3.1</flyway.version>
 		<freemarker.version>2.3.21</freemarker.version>