Merge pull request #2618 from ajssmith/amqp1_dev1_branch