fix #2170, #2135, #2121 and #1957
Merge branch 'dev' of github.com:WindowsAzure/azure-sdk-tools into dev
fix typo
Merge pull request #2206 from guangyang/dev

fix #2170, #2135, #2121 and #1957