Merge branch 'idstools-refactor' of https://github.com/Security-Onion-Solutions/securityonion into idstools-refactor

salt/manager/tools/sbin/soup

@@ -1301,8 +1301,10 @@ rm /opt/so/saltstack/local/salt/suricata/rules
 rm -rf /usr/sbin/so-idstools*
 sed -i '/^#\?so-idstools$/d' /opt/so/conf/so-status/so-status.conf
 
-# Backup the salt master config before editing it
-cp /etc/salt/master  /nsm/backup/detections-migration/2-4-200
+# Backup the salt master config & manager pillar before editing it
+cp /opt/so/saltstack/local/pillar/minions/$MINIONID.sls /nsm/backup/detections-migration/2-4-200/
+cp /etc/salt/master  /nsm/backup/detections-migration/2-4-200/
+so-yaml.py remove /opt/so/saltstack/local/pillar/minions/$MINIONID.sls idstools
 so-yaml.py removelistitem /etc/salt/master file_roots.base /opt/so/rules/nids
 
 }