Mitigation for issue #1232
Responding to CR feedbac
Merge branch 'release-0.6.12.1' of https://github.com/WindowsAzure/azure-sdk-tools into firstsitefix
Merge pull request #1241 from markcowl/firstsitefix

Mitigation for Issue #1232