Merge branch '1.5.x' into 2.0.x

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -62,7 +62,7 @@
 		<elasticsearch.version>5.6.9</elasticsearch.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<groovy.version>2.4.15</groovy.version>
-		<gson.version>2.8.4</gson.version>
+		<gson.version>2.8.5</gson.version>
 		<h2.version>1.4.197</h2.version>
 		<hamcrest.version>1.3</hamcrest.version>
 		<hazelcast.version>3.9.4</hazelcast.version>