Merge branch '1.4.x' into 1.5.x

spring-boot-dependencies/pom.xml

@@ -151,7 +151,7 @@
 		<snakeyaml.version>1.17</snakeyaml.version>
 		<solr.version>5.5.3</solr.version>
 		<spock.version>1.0-groovy-2.4</spock.version>
-		<spring.version>4.3.7.BUILD-SNAPSHOT</spring.version>
+		<spring.version>4.3.6.RELEASE</spring.version>
 		<spring-amqp.version>1.7.0.RELEASE</spring-amqp.version>
 		<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version>
 		<spring-batch.version>3.0.7.RELEASE</spring-batch.version>