Fix issue #1312 -- Updates for Service Bus AMQP GA release