Merge pull request #315 from markcowl/bug311

Bug 311
Patchable
Fix for Issue WindowsAzure/azure-sdk-tools#2150
Merge pull request #318 from kenegozi/patch

Patchable
Merge pull request #323 from markcowl/bug2150

Fix for Issue WindowsAzure/azure-sdk-tools#2150
Merge pull request #326 from veena-udayabhanu/dev

Dev
Merge branch 'master' of https://github.com/WindowsAzure/azure-sdk-for-net into dev