Merge branch '3006.x' into merge/3007.x/3006.x

Author: dwoz

changelog/65842.fixed.md

@@ -1,9 +1,3 @@
-# permissions on /var/log/salt to permit adm group ownership
-salt-common: non-standard-dir-perm
-
-# minor formatting error in table in man page
-salt-common: manpage-has-errors-from-man
-
 opt/saltstack/salt/salt-pip /usr/bin/salt-pip
 opt/saltstack/salt/salt-call /usr/bin/salt-call
 usr/share/bash-completion/completions/salt-common usr/share/bash-completion/completions/salt-call

changelog/66936.fixed.md

@@ -148,10 +148,13 @@ IMCAC - Immediate Custom Action - It's immediate
     Another application has exclusive access to the file \salt\var\log\salt\minion
     Please shut down the application
     -->
-    <CustomAction Id="stopSalt" Script="vbscript">
-      On error resume next
-      Set objShell = CreateObject("WScript.Shell")
-      objShell.Run "net stop salt-minion", 0, true
+    <CustomAction Id="stopSalt" Script="jscript">
+      try {
+        var objShell = new ActiveXObject("WScript.Shell");
+        objShell.Run("net stop salt-minion", 0, true);
+      } catch (e) {
+        // Handle error if needed
+      }
     </CustomAction>
 
     <!-- This is the import statement for the Custom Actions: