Merge pull request #2802 from ajssmith/amqp1_dev2_branch