Merge conflicts

Author: Bob Pokorny

CHANGELOG.md

@@ -19,6 +19,7 @@
 * Fixed an issue with SSL Flags greater than 3 were not being applied correctly to newer IIS servers.
 * Fixed an issue when formatting private RSA keys when connecting using the ssh protocol.
 * When using ssh protocol in containers, the SQL ACL on private keys was not being updating correctly.  This has been fixed.
+* Updated documentation to indicate that the username and password fields on the Cert Store are automatically added by Command.
 
 2.6.3
 * Fixed re-enrollment or ODKG job when RDN Components contained escaped commas.

integration-manifest.json

@@ -80,7 +80,7 @@
                             "DependsOn": "",
                             "DefaultValue": "",
                             "Required": false,
-                            "Description": "Username used to log into the target server for establishing the WinRM session. Example: 'administrator' or 'domain\\username'."
+                            "Description": "Username used to log into the target server for establishing the WinRM session. Example: 'administrator' or 'domain\\username'.  (This field is automatically created)"
                         },
                       {
                         "Name": "ServerPassword",
@@ -89,7 +89,7 @@
                         "DependsOn": "",
                         "DefaultValue": "",
                         "Required": false,
-                        "Description": "Password corresponding to the Server Username used to log into the target server.  When establishing a SSH session from a Linux environment, the password must include the full SSH Private key."
+                        "Description": "Password corresponding to the Server Username used to log into the target server.  When establishing a SSH session from a Linux environment, the password must include the full SSH Private key. (This field is automatically created)"
                       },
                         {
                             "Name": "ServerUseSsl",
@@ -172,23 +172,23 @@
                             "Required": true,
                             "Description": "String value specifying the port number that the Windows target server's WinRM listener is configured to use. Example: '5986' for HTTPS or '5985' for HTTP.  By default, when using ssh in a Linux environment, the default port number is 22."
                         },
-                        {
-                            "Name": "ServerUsername",
-                            "DisplayName": "Server Username",
-                            "Type": "Secret",
-                            "DependsOn": "",
-                            "DefaultValue": "",
-                            "Required": false,
-                            "Description": "Username used to log into the target server for establishing the WinRM session. Example: 'administrator' or 'domain\\username'."
-                        },
+                      {
+                        "Name": "ServerUsername",
+                        "DisplayName": "Server Username",
+                        "Type": "Secret",
+                        "DependsOn": "",
+                        "DefaultValue": "",
+                        "Required": false,
+                        "Description": "Username used to log into the target server for establishing the WinRM session. Example: 'administrator' or 'domain\\username'. (This field is automatically created)"
+                      },
                       {
                         "Name": "ServerPassword",
                         "DisplayName": "Server Password",
                         "Type": "Secret",
                         "DependsOn": "",
                         "DefaultValue": "",
                         "Required": false,
-                        "Description": "Password corresponding to the Server Username used to log into the target server.  When establishing a SSH session from a Linux environment, the password must include the full SSH Private key."
+                        "Description": "Password corresponding to the Server Username used to log into the target server.  When establishing a SSH session from a Linux environment, the password must include the full SSH Private key. (This field is automatically created)"
                       },
                         {
                             "Name": "ServerUseSsl",