Fix issue #1312 -- Updates for Service Bus AMQP GA release
Merge pull request #1313 from sethmanheim/working

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