Merge branch 'master' into dev

# Conflicts:
#	VERSION

salt/pcap/files/sensoroni.json

@@ -5,7 +5,7 @@
   "logFilename": "/opt/sensoroni/logs/sensoroni.log",
   "logLevel":"debug",
   "agent": {
-    "pollIntervalMs": {{ CHECKININTERVALMS }},
+    "pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }},
     "serverUrl": "https://{{ MANAGER }}/sensoroniagents",
     "verifyCert": false,
     "modules": {

salt/soc/files/soc/changes.json

@@ -1,6 +1,12 @@
 {
-  "title": "Security Onion 2.0.0 RC1 is here!",
+  "title": "Security Onion 2.0.2 RC1 is here!",
   "changes": [
+    { "summary": "Fixed standalone pcap interval issue." },
+    { "summary": "<a target='so-github' href='https://github.com/Security-Onion-Solutions/securityonion/issues/1067'>Security Fix 1067:</a> variables.txt from ISO install stays on disk for 10 days." }, 
+    { "summary": "<a target='so-github' href='https://github.com/Security-Onion-Solutions/securityonion/issues/1068'>Security Fix 1068:</a> Remove user values from static.sls." },
+    { "summary": "<a target='so-github' href='https://github.com/Security-Onion-Solutions/securityonion/issues/1059'>Issue 1059:</a> Fix distributed deployment sensor interval issue allowing PCAP." }, 
+    { "summary": "<a target='so-github' href='https://github.com/Security-Onion-Solutions/securityonion/issues/1058'>Issue 1058:</a> Support for passwords that start with special characters." },
+    { "summary": "Minor soup updates." },
     { "summary": "Re-branded 2.0 to give it a fresh look." },
     { "summary": "All documentation has moved to <a target='so-help' href='https://docs.securityonion.net/en/2.0'>https://docs.securityonion.net/en/2.0</a>" },
     { "summary": "<i>soup</i> is alive! Note: This tool only updates Security Onion components. Please use the built-in OS update process to keep the OS and other components up to date." },