Merge branch '1.2.x'

Author: wilkinsona

spring-boot-dependencies/pom.xml

@@ -152,7 +152,7 @@
 		<thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
 		<thymeleaf-layout-dialect.version>1.2.9</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
-		<tomcat.version>8.0.23</tomcat.version>
+		<tomcat.version>8.0.26</tomcat.version>
 		<undertow.version>1.2.10.Final</undertow.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity-tools.version>2.0</velocity-tools.version>