Upgrade to latest Spring Integration and AMQP milestones

Closes gh-1493
Closes gh-1517