Merge branch 'dev' of https://github.com/Azure/azure-sdk-tools into dev2