Upgrade to Spring Integration 4.0.5.RELEASE

Closes gh-1905
Upgrade to Spring AMQP 1.3.7.RELEASE

Closes gh-1906
Upgrade to Tomcat 7.0.57

Closes gh-1936
Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml