Merge branch '1.4.x' into 1.5.x

Author: wilkinsona

spring-boot-dependencies/pom.xml

@@ -128,7 +128,7 @@
 		<junit.version>4.12</junit.version>
 		<liquibase.version>3.5.3</liquibase.version>
 		<log4j2.version>2.7</log4j2.version>
-		<logback.version>1.1.10</logback.version>
+		<logback.version>1.1.11</logback.version>
 		<lombok.version>1.16.14</lombok.version>
 		<mariadb.version>1.5.8</mariadb.version>
 		<mssql-jdbc.version>6.1.0.jre7</mssql-jdbc.version>