Upgrade to Spring Integration 4.0.4 and Spring AMQP 1.3.6

Closes gh-1503
Closes gh-1505

spring-boot-dependencies/pom.xml

@@ -99,11 +99,11 @@
 		<solr.version>4.7.2</solr.version>
 		<spock.version>0.7-groovy-2.0</spock.version>
 		<spring.version>4.0.7.RELEASE</spring.version>
-		<spring-amqp.version>1.3.5.RELEASE</spring-amqp.version>
+		<spring-amqp.version>1.3.6.RELEASE</spring-amqp.version>
 		<spring-batch.version>3.0.1.RELEASE</spring-batch.version>
 		<spring-data-releasetrain.version>Dijkstra-SR4</spring-data-releasetrain.version>
 		<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
-		<spring-integration.version>4.0.3.RELEASE</spring-integration.version>
+		<spring-integration.version>4.0.4.RELEASE</spring-integration.version>
 		<spring-loaded.version>1.2.0.RELEASE</spring-loaded.version>
 		<spring-mobile.version>1.1.2.RELEASE</spring-mobile.version>
 		<spring-social.version>1.1.0.RELEASE</spring-social.version>