Upgrade to Spring Integration 4.0.4 and Spring AMQP 1.3.6

Closes gh-1503
Closes gh-1505
Merge branch '1.1.x'