Merge branch '1.5.x'

Author: wilkinsona

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

@@ -58,7 +58,7 @@
 		<ehcache3.version>3.5.2</ehcache3.version>
 		<embedded-mongo.version>2.0.3</embedded-mongo.version>
 		<flyway.version>5.0.7</flyway.version>
-		<freemarker.version>2.3.27-incubating</freemarker.version>
+		<freemarker.version>2.3.28</freemarker.version>
 		<elasticsearch.version>5.6.8</elasticsearch.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<groovy.version>2.4.15</groovy.version>