Merge pull request #2797 from rubenk/amqp-cleanups