AMQP cleanup and race condition fixes.
Merge pull request #974 from mozilla-services/amqp-cleanup

AMQP cleanup and race condition fixes.