important x:nil fix
Merge pull request #1985 from jeffwilcox/dev

important x:nil fix
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools into azurert-sm-integration