Merge and squash from wayan to wayan-pr (#1)

* Added RetryAfter support for New-AzureRmResourceGroupDeployment

* Revert "Added RetryAfter support for New-AzureRmResourceGroupDeployment"

This reverts commit ccf9ded.

* Redo the change using methods within the SDK

* Updated comments

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/SdkClient/ResourceManagerSdkClient.cs

@@ -314,7 +314,8 @@ private DeploymentExtended WaitDeploymentStatus(
         {
             DeploymentExtended deployment;
 
-            // Poll deployment state and deployment operations with two phases. In phase one, poll every 5 seconds. Phase one 
+            // Poll deployment state and deployment operations after RetryAfter.
+            // If no RetryAfter provided: In phase one, poll every 5 seconds. Phase one 
             // takes 400 seconds. In phase two, poll every 60 seconds. 
             const int counterUnit = 1000;
             int step = 5;
@@ -335,10 +336,18 @@ private DeploymentExtended WaitDeploymentStatus(
                     job(resourceGroup, deploymentName, basicDeployment);
                 }
 
-                deployment = ResourceManagementClient.Deployments.Get(resourceGroup, deploymentName);
-
-                step = phaseOne > 0 ? 5 : 60;
-
+                using (var getResult = ResourceManagementClient.Deployments.GetWithHttpMessagesAsync(resourceGroup, deploymentName).ConfigureAwait(false).GetAwaiter().GetResult())
+                {
+                    deployment = getResult.Body;
+                    if (getResult.Response.Headers.RetryAfter != null && getResult.Response.Headers.RetryAfter.Delta.HasValue)
+                    {
+                        step = getResult.Response.Headers.RetryAfter.Delta.Value.Seconds;
+                    }
+                    else
+                    {
+                        step = phaseOne > 0 ? 5 : 60;
+                    }
+                }
             } while (!status.Any(s => s.ToString().Equals(deployment.Properties.ProvisioningState, StringComparison.OrdinalIgnoreCase)));
 
             return deployment;
@@ -549,7 +558,7 @@ public virtual PSResourceGroup CreatePSResourceGroup(PSCreateResourceGroupParame
                 },
                 () => resourceExists);
 
-            return  resourceGroup !=  null? resourceGroup.ToPSResourceGroup() : null;
+            return resourceGroup != null ? resourceGroup.ToPSResourceGroup() : null;
         }
 
         /// <summary>