conflicts from merging with UpdateCmdlets2

Author: robertla

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Collection/UpdateAzureRemoteAppCollection.cs

@@ -34,7 +34,7 @@ public class UpdateAzureRemoteAppCollection : RdsCmdlet
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The name of the RemoteApp template image."
         )]
-        [ValidatePattern(TemplateNameValidatorString)]
+        [ValidatePattern(TemplateImageNameValidatorString)]
         public string ImageName { get; set; }
 
         [Parameter(Mandatory = false,

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.Designer.cs

@@ -30,7 +30,7 @@ public abstract partial class RdsCmdlet
 
         protected const string UserPrincipalValdatorString = UserNameValidatorString + "@" + DomainNameValidatorString;
 
-        protected const string TemplateNameValidatorString = @"^[()A-Za-z][() ._\-A-Za-z0-9]{1,61}[A-Z-a-z0-9()]$";
+        protected const string TemplateImageNameValidatorString = @"^[()A-Za-z][() ._\-A-Za-z0-9]{1,61}[A-Z-a-z0-9()]$";
 
         protected const string IPv4ValidatorString = @"^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])$";
 

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Common/RemoteAppRegEx.cs

@@ -62,19 +62,17 @@ public override void ExecuteCmdlet()
                 {
                     VNetResult vnet = CallClient(() => Client.VNet.Get(VNetName, true), Client.VNet);
                     WriteObject(vnet.VNet);
-
-                    WriteVerboseWithTimestamp("The request completed successfully." +
-                        " Call Get-AzureRemoteAppVpnDeviceConfigScript to download the script and pass in the SharedKey returned by this cmdlet");
+                    WriteVerboseWithTimestamp(Commands_RemoteApp.RequestSuccessful);
                 }
                 else
                 {
                     if (maxRetries > 0)
                     {
-                        WriteErrorWithTimestamp("The request failed.");
+                        WriteErrorWithTimestamp(Commands_RemoteApp.RequestFailed);
                     }
                     else
                     {
-                        WriteErrorWithTimestamp("The request took a long time to complete.");
+                        WriteErrorWithTimestamp(Commands_RemoteApp.VNetTimeout);
                     }
                 }
             }