merge from azure/azure-powershell/dev