Retry on conflict error
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell into dev
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell into dev