Merge branch '1.5.x' into 2.0.x

Author: wilkinsona

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

@@ -34,7 +34,7 @@
 		<!-- Dependency versions -->
 		<activemq.version>5.15.3</activemq.version>
 		<antlr2.version>2.7.7</antlr2.version>
-		<appengine-sdk.version>1.9.63</appengine-sdk.version>
+		<appengine-sdk.version>1.9.64</appengine-sdk.version>
 		<artemis.version>2.4.0</artemis.version>
 		<aspectj.version>1.8.13</aspectj.version>
 		<assertj.version>3.9.1</assertj.version>
@@ -120,7 +120,7 @@
 		<liquibase.version>3.5.5</liquibase.version>
 		<log4j2.version>2.10.0</log4j2.version>
 		<logback.version>1.2.3</logback.version>
-		<lombok.version>1.16.20</lombok.version>
+		<lombok.version>1.16.22</lombok.version>
 		<mariadb.version>2.2.3</mariadb.version>
 		<micrometer.version>1.0.4</micrometer.version>
 		<mockito.version>2.15.0</mockito.version>