For WindowsAzure\#2077 and WindowsAzure\#2056.
Fixes pending on the SM.NET library.
Merge branch 'dev' of https://github.com/huangpf/azure-sdk-tools into dev