Sync the kombu and amqp versions.

These versions were out of sync (kombu required a later amqp version),
which broke fresh installs such as via the Vagrantfile. This CR syncs
the versions.

Change-Id: Ie2cd9c50781bf014625b681e52e5506fd4904841
Merge "Sync the kombu and amqp versions."