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

Conflicts:
	WindowsAzurePowershell/src/Commands.ServiceManagement/IaaS/Network/SetAzureVnetGatewayKey.cs
Merge branch 'dev' of https://github.com/brooklyngwdev/azure-sdk-tools into dev