diff --git a/.ci/docs b/.ci/docs
index e062fac8d4..00e13b4cc4 100644
--- a/.ci/docs
+++ b/.ci/docs
@@ -6,6 +6,15 @@ properties([
     buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')),
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 def shell_header
 
 node('docs') {
diff --git a/.ci/kitchen-amazon2-py2 b/.ci/kitchen-amazon2-py2
index ca468e2cc8..d3f9d4165b 100644
--- a/.ci/kitchen-amazon2-py2
+++ b/.ci/kitchen-amazon2-py2
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-amazon2-py3 b/.ci/kitchen-amazon2-py3
index 281dc94bd1..cb7b1b3bd2 100644
--- a/.ci/kitchen-amazon2-py3
+++ b/.ci/kitchen-amazon2-py3
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-centos6-py2 b/.ci/kitchen-centos6-py2
index c933419980..24f7304dd2 100644
--- a/.ci/kitchen-centos6-py2
+++ b/.ci/kitchen-centos6-py2
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2
index 57bbbfbb6f..d16be73e9d 100644
--- a/.ci/kitchen-centos7-py2
+++ b/.ci/kitchen-centos7-py2
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3
index bfb7d8dfa9..421a7009e5 100644
--- a/.ci/kitchen-centos7-py3
+++ b/.ci/kitchen-centos7-py3
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-debian8-py2 b/.ci/kitchen-debian8-py2
index 19bb4f0d62..d7ca1dfa16 100644
--- a/.ci/kitchen-debian8-py2
+++ b/.ci/kitchen-debian8-py2
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-debian8-py3 b/.ci/kitchen-debian8-py3
index 43e258cd1a..36ce80391e 100644
--- a/.ci/kitchen-debian8-py3
+++ b/.ci/kitchen-debian8-py3
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-debian9-py2 b/.ci/kitchen-debian9-py2
index 3f51c5dd8d..d094419e8c 100644
--- a/.ci/kitchen-debian9-py2
+++ b/.ci/kitchen-debian9-py2
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-debian9-py3 b/.ci/kitchen-debian9-py3
index 5932cff8e8..60e605cb7f 100644
--- a/.ci/kitchen-debian9-py3
+++ b/.ci/kitchen-debian9-py3
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-fedora29-py2 b/.ci/kitchen-fedora29-py2
index 667157159e..d285ff3bb0 100644
--- a/.ci/kitchen-fedora29-py2
+++ b/.ci/kitchen-fedora29-py2
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-fedora29-py3 b/.ci/kitchen-fedora29-py3
index 7f91e3208f..675de442d4 100644
--- a/.ci/kitchen-fedora29-py3
+++ b/.ci/kitchen-fedora29-py3
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-ubuntu1604-py2 b/.ci/kitchen-ubuntu1604-py2
index 0252e23a2a..1a5b877372 100644
--- a/.ci/kitchen-ubuntu1604-py2
+++ b/.ci/kitchen-ubuntu1604-py2
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-ubuntu1604-py3 b/.ci/kitchen-ubuntu1604-py3
index 7584b35408..3dff1bd1fc 100644
--- a/.ci/kitchen-ubuntu1604-py3
+++ b/.ci/kitchen-ubuntu1604-py3
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-ubuntu1804-py2 b/.ci/kitchen-ubuntu1804-py2
index f4a7c2924d..dc2fffb360 100644
--- a/.ci/kitchen-ubuntu1804-py2
+++ b/.ci/kitchen-ubuntu1804-py2
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-ubuntu1804-py3 b/.ci/kitchen-ubuntu1804-py3
index 01bd7df6c7..754f398886 100644
--- a/.ci/kitchen-ubuntu1804-py3
+++ b/.ci/kitchen-ubuntu1804-py3
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-windows2016-py2 b/.ci/kitchen-windows2016-py2
index 92b94805b8..b050fafa00 100644
--- a/.ci/kitchen-windows2016-py2
+++ b/.ci/kitchen-windows2016-py2
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/kitchen-windows2016-py3 b/.ci/kitchen-windows2016-py3
index b24dbf0468..d87bb23787 100644
--- a/.ci/kitchen-windows2016-py3
+++ b/.ci/kitchen-windows2016-py3
@@ -17,6 +17,15 @@ properties([
     ])
 ])
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
 node('kitchen-slave') {
     timeout(time: global_timeout, unit: 'HOURS') {
         withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
diff --git a/.ci/lint b/.ci/lint
index 3a4e1ae80b..a6da7bfc21 100644
--- a/.ci/lint
+++ b/.ci/lint
@@ -8,6 +8,17 @@ properties([
 
 def shell_header
 
+// Be sure to cancel any previously running builds
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) {
+    // This will cancel the previous build which also defined a matching milestone
+    milestone(buildNumber - 1)
+}
+// Define a milestone for this build so that, if another build starts, this one will be aborted
+milestone(buildNumber)
+
+def lint_report_issues = []
+
 node('lint') {
     timeout(time: global_timeout, unit: 'HOURS') {
         ansiColor('xterm') {
@@ -56,7 +67,10 @@ node('lint') {
                             nox --install-only -e lint-tests
                             '''
                         }
-                        archiveArtifacts artifacts: 'file-list-status.log,file-list-changed.log,file-list-deleted.log,file-list-experiment.log'
+                        archiveArtifacts(
+                            artifacts: 'file-list-status.log,file-list-changed.log,file-list-deleted.log,file-list-experiment.log',
+                            allowEmptyArchive: true
+                        )
                     }
 
                     stage('Lint Changes') {
@@ -95,7 +109,10 @@ node('lint') {
                             )
                         } finally {
                             def changed_logs_pattern = 'pylint-report-*-chg.log'
-                            archiveArtifacts artifacts: changed_logs_pattern, allowEmptyArchive: true
+                            archiveArtifacts(
+                                artifacts: changed_logs_pattern,
+                                allowEmptyArchive: true
+                            )
                             if (env.NODE_NAME.startsWith('jenkins-pr-')) {
                                 step([$class: 'WarningsPublisher',
                                     parserConfigurations: [[
@@ -108,7 +125,11 @@ node('lint') {
                                     usePreviousBuildAsReference: true
                                 ])
                             } else {
-                                recordIssues(enabledForFailure: true, tool: pyLint(pattern: changed_logs_pattern, reportEncoding: 'UTF-8'))
+                                lint_report_issues.add(
+                                    scanForIssues(
+                                        tool: pyLint(pattern: changed_logs_pattern, reportEncoding: 'UTF-8')
+                                    )
+                                )
                             }
                         }
                     }
@@ -152,7 +173,10 @@ node('lint') {
                                 )
                             } finally {
                                 def full_logs_pattern = 'pylint-report-*-full.log'
-                                archiveArtifacts artifacts: full_logs_pattern, allowEmptyArchive: true
+                                archiveArtifacts(
+                                    artifacts: full_logs_pattern,
+                                    allowEmptyArchive: true
+                                )
                                 if (env.NODE_NAME.startsWith('jenkins-pr-')) {
                                     step([$class: 'WarningsPublisher',
                                         parserConfigurations: [[
@@ -165,7 +189,11 @@ node('lint') {
                                         usePreviousBuildAsReference: true
                                     ])
                                 } else {
-                                    recordIssues(enabledForFailure: true, tool: pyLint(pattern: full_logs_pattern, reportEncoding: 'UTF-8'))
+                                    lint_report_issues.add(
+                                        scanForIssues(
+                                            tool: pyLint(pattern: full_logs_pattern, reportEncoding: 'UTF-8')
+                                        )
+                                    )
                                 }
                             }
                         }
@@ -173,6 +201,17 @@ node('lint') {
                 } catch (Exception e) {
                     currentBuild.result = 'FAILURE'
                 } finally {
+                    if (!env.NODE_NAME.startsWith('jenkins-pr-')) {
+                        publishIssues(
+                            enabledForFailure: true,
+                            aggregatingResults: true,
+                            referenceJobName: "${salt_target_branch}/salt-${salt_target_branch}-lint",
+                            qualityGates: [
+                                [threshold: 1, type: 'TOTAL', unstable: false]
+                            ],
+                            issues: lint_report_issues
+                        )
+                    }
                     cleanWs notFailBuild: true
                     if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
                         if (env.NODE_NAME.startsWith('jenkins-pr-')) {
diff --git a/pkg/windows/build_env_2.ps1 b/pkg/windows/build_env_2.ps1
index b87b8685a5..51547216f7 100644
--- a/pkg/windows/build_env_2.ps1
+++ b/pkg/windows/build_env_2.ps1
@@ -243,10 +243,6 @@ New-Item -Path "$($ini['Settings']['SitePkgs2Dir'])\win32com\gen_py" -ItemType D
 Write-Output " - $script_name :: Removing pywin32_system32 Directory . . ."
 Remove-Item "$($ini['Settings']['SitePkgs2Dir'])\pywin32_system32"
 
-# Remove pythonwin directory
-Write-Output " - $script_name :: Removing pythonwin Directory . . ."
-Remove-Item "$($ini['Settings']['SitePkgs2Dir'])\pythonwin" -Force -Recurse
-
 # Remove PyWin32 PostInstall and testall Scripts
 Write-Output " - $script_name :: Removing PyWin32 scripts . . ."
 Remove-Item "$($ini['Settings']['Scripts2Dir'])\pywin32_*" -Force -Recurse
diff --git a/pkg/windows/build_env_3.ps1 b/pkg/windows/build_env_3.ps1
index 34e83e6953..0260d3703a 100644
--- a/pkg/windows/build_env_3.ps1
+++ b/pkg/windows/build_env_3.ps1
@@ -241,10 +241,6 @@ New-Item -Path "$($ini['Settings']['SitePkgs3Dir'])\win32com\gen_py" -ItemType D
 Write-Output " - $script_name :: Removing pywin32_system32 Directory . . ."
 Remove-Item "$($ini['Settings']['SitePkgs3Dir'])\pywin32_system32"
 
-# Remove pythonwin directory
-Write-Output " - $script_name :: Removing pythonwin Directory . . ."
-Remove-Item "$($ini['Settings']['SitePkgs3Dir'])\pythonwin" -Force -Recurse
-
 # Remove PyWin32 PostInstall and testall Scripts
 Write-Output " - $script_name :: Removing PyWin32 scripts . . ."
 Remove-Item "$($ini['Settings']['Scripts3Dir'])\pywin32_*" -Force -Recurse
diff --git a/requirements/static/fedora-28.in b/requirements/static/fedora-30.in
similarity index 100%
rename from requirements/static/fedora-28.in
rename to requirements/static/fedora-30.in
diff --git a/requirements/static/opensuse-42.in b/requirements/static/opensuse-42.in
deleted file mode 100644
index d36d6afce3..0000000000
--- a/requirements/static/opensuse-42.in
+++ /dev/null
@@ -1,39 +0,0 @@
-# This is a compilation of requirements installed on salt-jenkins git.salt state run
-apache-libcloud==2.0.0
-boto3
-boto>=2.46.0
-certifi
-cffi
-cherrypy==17.3.0
-croniter>=0.3.0,!=0.3.22
-dnspython
-docker
-futures>=2.0; python_version < '3.0'
-GitPython
-hgtools
-jsonschema<=2.6.0
-keyring==5.7.1
-kubernetes<4.0
-mock>=2.0.0; python_version < '3.6'
-more-itertools==5.0.0
-moto
-msgpack-python >= 0.4.2, != 0.5.5
-psutil
-# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
-# PyCrypto, if pulled, will be removed from the generated static requirements
-pycryptodome
-pyinotify
-pyopenssl
-python-etcd>0.4.2
-python-gnupg
-pyvmomi
-requests
-rfc3987
-salttesting==2017.6.1
-setproctitle
-setuptools-scm
-strict_rfc3339
-supervisor==3.3.5; python_version < '3'
-timelib
-tornado<5.0
-virtualenv
diff --git a/requirements/static/py2.7/raet-fedora-28.txt b/requirements/static/py2.7/raet-fedora-30.txt
similarity index 97%
rename from requirements/static/py2.7/raet-fedora-28.txt
rename to requirements/static/py2.7/raet-fedora-30.txt
index 23593cacc9..f8f0d9dd56 100644
--- a/requirements/static/py2.7/raet-fedora-28.txt
+++ b/requirements/static/py2.7/raet-fedora-30.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py2.7/raet-fedora-28.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/fedora-28.in
+#    pip-compile -o requirements/static/py2.7/raet-fedora-30.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/fedora-30.in
 #
 apache-libcloud==2.0.0
 asn1crypto==0.24.0        # via cryptography
diff --git a/requirements/static/py2.7/raet-opensuse-42.txt b/requirements/static/py2.7/raet-opensuse-42.txt
deleted file mode 100644
index 7c17b3fbfe..0000000000
--- a/requirements/static/py2.7/raet-opensuse-42.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile -o requirements/static/py2.7/raet-opensuse-42.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/opensuse-42.in
-#
-apache-libcloud==2.0.0
-asn1crypto==0.24.0        # via cryptography
-atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-aws-xray-sdk==0.95        # via moto
-backports-abc==0.5        # via tornado
-backports.functools-lru-cache==1.5  # via cheroot, jaraco.functools
-backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
-backports.tempfile==1.0   # via moto
-backports.weakref==1.0.post1  # via backports.tempfile
-boto3==1.9.132
-boto==2.49.0
-botocore==1.12.132        # via boto3, moto, s3transfer
-cachetools==3.1.0         # via google-auth
-certifi==2019.3.9
-cffi==1.12.2
-chardet==3.0.4            # via requests
-cheroot==6.5.4            # via cherrypy
-cherrypy==17.3.0
-contextlib2==0.5.5        # via cherrypy
-cookies==2.2.1            # via responses
-coverage==4.5.3           # via pytest-cov
-croniter==0.3.29
-cryptography==2.6.1       # via moto, pyopenssl
-dnspython==1.16.0
-docker-pycreds==0.4.0     # via docker
-docker==3.7.2
-docutils==0.14            # via botocore
-ecdsa==0.13.2             # via python-jose
-enum34==1.1.6             # via cryptography, raet
-funcsigs==1.0.2           # via mock, pytest
-functools32==3.2.3.post2  # via jsonschema
-future==0.17.1            # via python-jose
-futures==3.2.0 ; python_version < "3.0"
-gitdb2==2.0.5             # via gitpython
-gitpython==2.1.11
-google-auth==1.6.3        # via kubernetes
-hgtools==8.1.1
-idna==2.8                 # via requests
-ioflo==1.7.5
-ipaddress==1.0.22         # via cryptography, docker, kubernetes
-jaraco.functools==2.0     # via tempora
-jinja2==2.10.1
-jmespath==0.9.4           # via boto3, botocore
-jsondiff==1.1.1           # via moto
-jsonpickle==1.1           # via aws-xray-sdk
-jsonschema==2.6.0
-keyring==5.7.1
-kubernetes==3.0.0
-libnacl==1.6.1
-markupsafe==1.1.1
-meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.6"
-more-itertools==5.0.0
-moto==1.3.7
-msgpack-python==0.5.6
-msgpack==0.6.1
-pathlib2==2.3.3           # via pytest
-pbr==5.1.3                # via mock
-pluggy==0.9.0             # via pytest
-portend==2.4              # via cherrypy
-psutil==5.6.1
-py==1.8.0                 # via pytest
-pyaml==19.4.1             # via moto
-pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5             # via pyasn1-modules, rsa
-pycparser==2.19           # via cffi
-pycryptodome==3.8.1
-pyinotify==0.9.6
-pyopenssl==19.0.0
-pytest-cov==2.6.1
-pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
-python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
-python-etcd==0.4.5
-python-gnupg==0.4.4
-python-jose==2.0.2        # via moto
-pytz==2019.1              # via moto, tempora
-pyvmomi==6.7.1.2018.12
-pyyaml==3.13
-raet==0.6.8
-requests==2.21.0
-responses==0.10.6         # via moto
-rfc3987==1.3.8
-rsa==4.0                  # via google-auth
-s3transfer==0.2.0         # via boto3
-salttesting==2017.6.1
-scandir==1.10.0           # via pathlib2
-setproctitle==1.1.10
-setuptools-scm==3.2.0
-singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
-smmap2==2.0.5             # via gitdb2
-strict-rfc3339==0.7
-supervisor==3.3.5 ; python_version < "3"
-tempora==1.14.1           # via portend
-timelib==0.2.4
-tornado==4.5.3 ; python_version < "3"
-urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
-virtualenv==16.4.3
-websocket-client==0.40.0  # via docker, kubernetes
-werkzeug==0.15.2          # via moto
-wrapt==1.11.1             # via aws-xray-sdk
-xmltodict==0.12.0         # via moto
-zc.lockfile==1.4          # via cherrypy
diff --git a/requirements/static/py2.7/zeromq-fedora-28.txt b/requirements/static/py2.7/zeromq-fedora-30.txt
similarity index 97%
rename from requirements/static/py2.7/zeromq-fedora-28.txt
rename to requirements/static/py2.7/zeromq-fedora-30.txt
index 54dbd3ff94..9fa389f964 100644
--- a/requirements/static/py2.7/zeromq-fedora-28.txt
+++ b/requirements/static/py2.7/zeromq-fedora-30.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py2.7/zeromq-fedora-28.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/fedora-28.in
+#    pip-compile -o requirements/static/py2.7/zeromq-fedora-30.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/fedora-30.in
 #
 apache-libcloud==2.0.0
 asn1crypto==0.24.0        # via cryptography
diff --git a/requirements/static/py2.7/zeromq-opensuse-42.txt b/requirements/static/py2.7/zeromq-opensuse-42.txt
deleted file mode 100644
index 7b9a583160..0000000000
--- a/requirements/static/py2.7/zeromq-opensuse-42.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile -o requirements/static/py2.7/zeromq-opensuse-42.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/opensuse-42.in
-#
-apache-libcloud==2.0.0
-asn1crypto==0.24.0        # via cryptography
-atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-aws-xray-sdk==0.95        # via moto
-backports-abc==0.5        # via tornado
-backports.functools-lru-cache==1.5  # via cheroot, jaraco.functools
-backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
-backports.tempfile==1.0   # via moto
-backports.weakref==1.0.post1  # via backports.tempfile
-boto3==1.9.132
-boto==2.49.0
-botocore==1.12.132        # via boto3, moto, s3transfer
-cachetools==3.1.0         # via google-auth
-certifi==2019.3.9
-cffi==1.12.2
-chardet==3.0.4            # via requests
-cheroot==6.5.4            # via cherrypy
-cherrypy==17.3.0
-contextlib2==0.5.5        # via cherrypy
-cookies==2.2.1            # via responses
-coverage==4.5.3           # via pytest-cov
-croniter==0.3.29
-cryptography==2.6.1       # via moto, pyopenssl
-dnspython==1.16.0
-docker-pycreds==0.4.0     # via docker
-docker==3.7.2
-docutils==0.14            # via botocore
-ecdsa==0.13.2             # via python-jose
-enum34==1.1.6             # via cryptography
-funcsigs==1.0.2           # via mock, pytest
-functools32==3.2.3.post2  # via jsonschema
-future==0.17.1            # via python-jose
-futures==3.2.0 ; python_version < "3.0"
-gitdb2==2.0.5             # via gitpython
-gitpython==2.1.11
-google-auth==1.6.3        # via kubernetes
-hgtools==8.1.1
-idna==2.8                 # via requests
-ipaddress==1.0.22         # via cryptography, docker, kubernetes
-jaraco.functools==2.0     # via tempora
-jinja2==2.10.1
-jmespath==0.9.4           # via boto3, botocore
-jsondiff==1.1.1           # via moto
-jsonpickle==1.1           # via aws-xray-sdk
-jsonschema==2.6.0
-keyring==5.7.1
-kubernetes==3.0.0
-markupsafe==1.1.1
-meld3==1.0.2              # via supervisor
-mock==2.0.0 ; python_version < "3.6"
-more-itertools==5.0.0
-moto==1.3.7
-msgpack-python==0.5.6
-msgpack==0.6.1
-pathlib2==2.3.3           # via pytest
-pbr==5.1.3                # via mock
-pluggy==0.9.0             # via pytest
-portend==2.4              # via cherrypy
-psutil==5.6.1
-py==1.8.0                 # via pytest
-pyaml==19.4.1             # via moto
-pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5             # via pyasn1-modules, rsa
-pycparser==2.19           # via cffi
-# Next line explicitly commented out by pip-tools-compile because of the following regex: '^pycrypto==(.*)$'
-# pycrypto==2.6.1 ; sys_platform != "win32"
-pycryptodome==3.8.1
-pyinotify==0.9.6
-pyopenssl==19.0.0
-pytest-cov==2.6.1
-pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
-python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
-python-etcd==0.4.5
-python-gnupg==0.4.4
-python-jose==2.0.2        # via moto
-pytz==2019.1              # via moto, tempora
-pyvmomi==6.7.1.2018.12
-pyyaml==3.13
-pyzmq==18.0.1 ; python_version != "3.4"
-requests==2.21.0
-responses==0.10.6         # via moto
-rfc3987==1.3.8
-rsa==4.0                  # via google-auth
-s3transfer==0.2.0         # via boto3
-salttesting==2017.6.1
-scandir==1.10.0           # via pathlib2
-setproctitle==1.1.10
-setuptools-scm==3.2.0
-singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
-smmap2==2.0.5             # via gitdb2
-strict-rfc3339==0.7
-supervisor==3.3.5 ; python_version < "3"
-tempora==1.14.1           # via portend
-timelib==0.2.4
-tornado==4.5.3 ; python_version < "3"
-urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
-virtualenv==16.4.3
-websocket-client==0.40.0  # via docker, kubernetes
-werkzeug==0.15.2          # via moto
-wrapt==1.11.1             # via aws-xray-sdk
-xmltodict==0.12.0         # via moto
-zc.lockfile==1.4          # via cherrypy
diff --git a/requirements/static/py3.4/raet-amzn-2.txt b/requirements/static/py3.4/raet-amzn-2.txt
index a3b788a444..ff82ac8f92 100644
--- a/requirements/static/py3.4/raet-amzn-2.txt
+++ b/requirements/static/py3.4/raet-amzn-2.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -29,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -97,7 +100,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/raet-arch.txt b/requirements/static/py3.4/raet-arch.txt
index 37f873fae9..84841284ae 100644
--- a/requirements/static/py3.4/raet-arch.txt
+++ b/requirements/static/py3.4/raet-arch.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -29,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -87,7 +90,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scandir==1.10.0           # via pathlib2
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/raet-centos-7.txt b/requirements/static/py3.4/raet-centos-7.txt
index b5b9f3866f..192b317183 100644
--- a/requirements/static/py3.4/raet-centos-7.txt
+++ b/requirements/static/py3.4/raet-centos-7.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -29,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -97,7 +100,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/raet-debian-8.txt b/requirements/static/py3.4/raet-debian-8.txt
index e14b37bbb5..e314980c88 100644
--- a/requirements/static/py3.4/raet-debian-8.txt
+++ b/requirements/static/py3.4/raet-debian-8.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -29,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -96,7 +99,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/raet-debian-9.txt b/requirements/static/py3.4/raet-debian-9.txt
index b1c8909597..b68906ce48 100644
--- a/requirements/static/py3.4/raet-debian-9.txt
+++ b/requirements/static/py3.4/raet-debian-9.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -29,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -96,7 +99,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/raet-fedora-29.txt b/requirements/static/py3.4/raet-fedora-29.txt
index c0247f82b0..1541ca81d0 100644
--- a/requirements/static/py3.4/raet-fedora-29.txt
+++ b/requirements/static/py3.4/raet-fedora-29.txt
@@ -9,14 +9,15 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -30,6 +31,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -98,7 +101,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/raet-fedora-28.txt b/requirements/static/py3.4/raet-fedora-30.txt
similarity index 97%
rename from requirements/static/py3.4/raet-fedora-28.txt
rename to requirements/static/py3.4/raet-fedora-30.txt
index 6783f4cd0e..3c60c3ba2d 100644
--- a/requirements/static/py3.4/raet-fedora-28.txt
+++ b/requirements/static/py3.4/raet-fedora-30.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.4/raet-fedora-28.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/fedora-28.in
+#    pip-compile -o requirements/static/py3.4/raet-fedora-30.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/fedora-30.in
 #
 apache-libcloud==2.0.0
 asn1crypto==0.24.0        # via cryptography
diff --git a/requirements/static/py3.4/raet-opensuse-42.txt b/requirements/static/py3.4/raet-opensuse-42.txt
deleted file mode 100644
index a54cec99af..0000000000
--- a/requirements/static/py3.4/raet-opensuse-42.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile -o requirements/static/py3.4/raet-opensuse-42.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/opensuse-42.in
-#
-apache-libcloud==2.0.0
-asn1crypto==0.24.0        # via cryptography
-atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-aws-xray-sdk==0.95        # via moto
-backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
-boto3==1.9.132
-boto==2.49.0
-botocore==1.12.132        # via boto3, moto, s3transfer
-cachetools==3.1.0         # via google-auth
-certifi==2019.3.9
-cffi==1.12.2
-chardet==3.0.4            # via requests
-cheroot==6.5.4            # via cherrypy
-cherrypy==17.3.0
-contextlib2==0.5.5        # via cherrypy
-coverage==4.5.3           # via pytest-cov
-croniter==0.3.29
-cryptography==2.6.1       # via moto, pyopenssl
-dnspython==1.16.0
-docker-pycreds==0.4.0     # via docker
-docker==3.7.2
-docutils==0.14            # via botocore
-ecdsa==0.13.2             # via python-jose
-future==0.17.1            # via python-jose
-gitdb2==2.0.5             # via gitpython
-gitpython==2.1.11
-google-auth==1.6.3        # via kubernetes
-hgtools==8.1.1
-idna==2.8                 # via requests
-ioflo==1.7.5
-ipaddress==1.0.22         # via kubernetes
-jaraco.functools==2.0     # via tempora
-jinja2==2.10.1
-jmespath==0.9.4           # via boto3, botocore
-jsondiff==1.1.1           # via moto
-jsonpickle==1.1           # via aws-xray-sdk
-jsonschema==2.6.0
-keyring==5.7.1
-kubernetes==3.0.0
-libnacl==1.6.1
-markupsafe==1.1.1
-mock==2.0.0 ; python_version < "3.6"
-more-itertools==5.0.0
-moto==1.3.7
-msgpack-python==0.5.6
-msgpack==0.6.1
-pathlib2==2.3.3           # via pytest
-pbr==5.1.3                # via mock
-pluggy==0.9.0             # via pytest
-portend==2.4              # via cherrypy
-psutil==5.6.1
-py==1.8.0                 # via pytest
-pyaml==19.4.1             # via moto
-pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5             # via pyasn1-modules, rsa
-pycparser==2.19           # via cffi
-pycryptodome==3.8.1
-pyinotify==0.9.6
-pyopenssl==19.0.0
-pytest-cov==2.6.1
-pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
-python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
-python-etcd==0.4.5
-python-gnupg==0.4.4
-python-jose==2.0.2        # via moto
-pytz==2019.1              # via moto, tempora
-pyvmomi==6.7.1.2018.12
-pyyaml==3.13
-raet==0.6.8
-requests==2.21.0
-responses==0.10.6         # via moto
-rfc3987==1.3.8
-rsa==4.0                  # via google-auth
-s3transfer==0.2.0         # via boto3
-salttesting==2017.6.1
-scandir==1.10.0           # via pathlib2
-setproctitle==1.1.10
-setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
-smmap2==2.0.5             # via gitdb2
-strict-rfc3339==0.7
-tempora==1.14.1           # via portend
-timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
-urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
-virtualenv==16.4.3
-websocket-client==0.40.0  # via docker, kubernetes
-werkzeug==0.15.2          # via moto
-wrapt==1.11.1             # via aws-xray-sdk
-xmltodict==0.12.0         # via moto
-zc.lockfile==1.4          # via cherrypy
diff --git a/requirements/static/py3.4/raet-opensuse-leap-15.txt b/requirements/static/py3.4/raet-opensuse-leap-15.txt
index 66915e400f..6e7c9a6dce 100644
--- a/requirements/static/py3.4/raet-opensuse-leap-15.txt
+++ b/requirements/static/py3.4/raet-opensuse-leap-15.txt
@@ -9,8 +9,9 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -29,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -89,7 +92,8 @@ salttesting==2017.6.1
 scandir==1.10.0           # via pathlib2
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/raet-ubuntu-16.04.txt b/requirements/static/py3.4/raet-ubuntu-16.04.txt
index 4eb6a69d89..4a2e7120cf 100644
--- a/requirements/static/py3.4/raet-ubuntu-16.04.txt
+++ b/requirements/static/py3.4/raet-ubuntu-16.04.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -29,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -96,7 +99,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/raet-ubuntu-18.04.txt b/requirements/static/py3.4/raet-ubuntu-18.04.txt
index 40e0b442d7..f46a97084f 100644
--- a/requirements/static/py3.4/raet-ubuntu-18.04.txt
+++ b/requirements/static/py3.4/raet-ubuntu-18.04.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -29,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -96,7 +99,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/zeromq-amzn-2.txt b/requirements/static/py3.4/zeromq-amzn-2.txt
index 2cdc5bc0a6..719c20357b 100644
--- a/requirements/static/py3.4/zeromq-amzn-2.txt
+++ b/requirements/static/py3.4/zeromq-amzn-2.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -97,7 +98,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/zeromq-arch.txt b/requirements/static/py3.4/zeromq-arch.txt
index c0e31da7e9..f0efdbcad3 100644
--- a/requirements/static/py3.4/zeromq-arch.txt
+++ b/requirements/static/py3.4/zeromq-arch.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -87,7 +88,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scandir==1.10.0           # via pathlib2
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/zeromq-centos-7.txt b/requirements/static/py3.4/zeromq-centos-7.txt
index 02d870e66a..9763d89b1a 100644
--- a/requirements/static/py3.4/zeromq-centos-7.txt
+++ b/requirements/static/py3.4/zeromq-centos-7.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -97,7 +98,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/zeromq-debian-8.txt b/requirements/static/py3.4/zeromq-debian-8.txt
index 0aa8901dc9..c06723758f 100644
--- a/requirements/static/py3.4/zeromq-debian-8.txt
+++ b/requirements/static/py3.4/zeromq-debian-8.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -96,7 +97,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/zeromq-debian-9.txt b/requirements/static/py3.4/zeromq-debian-9.txt
index 7528d00c86..00eeba21e0 100644
--- a/requirements/static/py3.4/zeromq-debian-9.txt
+++ b/requirements/static/py3.4/zeromq-debian-9.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -96,7 +97,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/zeromq-fedora-29.txt b/requirements/static/py3.4/zeromq-fedora-29.txt
index 2c74e69201..bce5eddda3 100644
--- a/requirements/static/py3.4/zeromq-fedora-29.txt
+++ b/requirements/static/py3.4/zeromq-fedora-29.txt
@@ -9,14 +9,15 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -98,7 +99,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/zeromq-fedora-28.txt b/requirements/static/py3.4/zeromq-fedora-30.txt
similarity index 97%
rename from requirements/static/py3.4/zeromq-fedora-28.txt
rename to requirements/static/py3.4/zeromq-fedora-30.txt
index 6fe2fd9a60..83811de922 100644
--- a/requirements/static/py3.4/zeromq-fedora-28.txt
+++ b/requirements/static/py3.4/zeromq-fedora-30.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.4/zeromq-fedora-28.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/fedora-28.in
+#    pip-compile -o requirements/static/py3.4/zeromq-fedora-30.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/fedora-30.in
 #
 apache-libcloud==2.0.0
 asn1crypto==0.24.0        # via cryptography
diff --git a/requirements/static/py3.4/zeromq-opensuse-42.txt b/requirements/static/py3.4/zeromq-opensuse-42.txt
deleted file mode 100644
index 912d336f6c..0000000000
--- a/requirements/static/py3.4/zeromq-opensuse-42.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile -o requirements/static/py3.4/zeromq-opensuse-42.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/opensuse-42.in
-#
-apache-libcloud==2.0.0
-asn1crypto==0.24.0        # via cryptography
-atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-aws-xray-sdk==0.95        # via moto
-backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
-boto3==1.9.132
-boto==2.49.0
-botocore==1.12.132        # via boto3, moto, s3transfer
-cachetools==3.1.0         # via google-auth
-certifi==2019.3.9
-cffi==1.12.2
-chardet==3.0.4            # via requests
-cheroot==6.5.4            # via cherrypy
-cherrypy==17.3.0
-contextlib2==0.5.5        # via cherrypy
-coverage==4.5.3           # via pytest-cov
-croniter==0.3.29
-cryptography==2.6.1       # via moto, pyopenssl
-dnspython==1.16.0
-docker-pycreds==0.4.0     # via docker
-docker==3.7.2
-docutils==0.14            # via botocore
-ecdsa==0.13.2             # via python-jose
-future==0.17.1            # via python-jose
-gitdb2==2.0.5             # via gitpython
-gitpython==2.1.11
-google-auth==1.6.3        # via kubernetes
-hgtools==8.1.1
-idna==2.8                 # via requests
-ipaddress==1.0.22         # via kubernetes
-jaraco.functools==2.0     # via tempora
-jinja2==2.10.1
-jmespath==0.9.4           # via boto3, botocore
-jsondiff==1.1.1           # via moto
-jsonpickle==1.1           # via aws-xray-sdk
-jsonschema==2.6.0
-keyring==5.7.1
-kubernetes==3.0.0
-markupsafe==1.1.1
-mock==2.0.0 ; python_version < "3.6"
-more-itertools==5.0.0
-moto==1.3.7
-msgpack-python==0.5.6
-msgpack==0.6.1
-pathlib2==2.3.3           # via pytest
-pbr==5.1.3                # via mock
-pluggy==0.9.0             # via pytest
-portend==2.4              # via cherrypy
-psutil==5.6.1
-py==1.8.0                 # via pytest
-pyaml==19.4.1             # via moto
-pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5             # via pyasn1-modules, rsa
-pycparser==2.19           # via cffi
-# Next line explicitly commented out by pip-tools-compile because of the following regex: '^pycrypto==(.*)$'
-# pycrypto==2.6.1 ; sys_platform != "win32"
-pycryptodome==3.8.1
-pyinotify==0.9.6
-pyopenssl==19.0.0
-pytest-cov==2.6.1
-pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
-python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
-python-etcd==0.4.5
-python-gnupg==0.4.4
-python-jose==2.0.2        # via moto
-pytz==2019.1              # via moto, tempora
-pyvmomi==6.7.1.2018.12
-pyyaml==3.13
-pyzmq==17.0.0 ; python_version == "3.4"
-requests==2.21.0
-responses==0.10.6         # via moto
-rfc3987==1.3.8
-rsa==4.0                  # via google-auth
-s3transfer==0.2.0         # via boto3
-salttesting==2017.6.1
-scandir==1.10.0           # via pathlib2
-setproctitle==1.1.10
-setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
-smmap2==2.0.5             # via gitdb2
-strict-rfc3339==0.7
-tempora==1.14.1           # via portend
-timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
-urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
-virtualenv==16.4.3
-websocket-client==0.40.0  # via docker, kubernetes
-werkzeug==0.15.2          # via moto
-wrapt==1.11.1             # via aws-xray-sdk
-xmltodict==0.12.0         # via moto
-zc.lockfile==1.4          # via cherrypy
diff --git a/requirements/static/py3.4/zeromq-opensuse-leap-15.txt b/requirements/static/py3.4/zeromq-opensuse-leap-15.txt
index 2329e2a1fa..62643fc709 100644
--- a/requirements/static/py3.4/zeromq-opensuse-leap-15.txt
+++ b/requirements/static/py3.4/zeromq-opensuse-leap-15.txt
@@ -9,8 +9,9 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -89,7 +90,8 @@ salttesting==2017.6.1
 scandir==1.10.0           # via pathlib2
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/zeromq-ubuntu-16.04.txt b/requirements/static/py3.4/zeromq-ubuntu-16.04.txt
index 04bd39ee49..52059c6041 100644
--- a/requirements/static/py3.4/zeromq-ubuntu-16.04.txt
+++ b/requirements/static/py3.4/zeromq-ubuntu-16.04.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -96,7 +97,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.4/zeromq-ubuntu-18.04.txt b/requirements/static/py3.4/zeromq-ubuntu-18.04.txt
index 1f82a327e6..18b35e1ea1 100644
--- a/requirements/static/py3.4/zeromq-ubuntu-18.04.txt
+++ b/requirements/static/py3.4/zeromq-ubuntu-18.04.txt
@@ -9,13 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via docker
+backports.ssl-match-hostname==3.7.0.1  # via docker, websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -96,7 +97,8 @@ scandir==1.10.0           # via pathlib2
 scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/raet-amzn-2.txt b/requirements/static/py3.5/raet-amzn-2.txt
index 4216cf046a..91cdfcdbfe 100644
--- a/requirements/static/py3.5/raet-amzn-2.txt
+++ b/requirements/static/py3.5/raet-amzn-2.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -28,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -94,7 +98,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/raet-arch.txt b/requirements/static/py3.5/raet-arch.txt
index 2a557df4fa..3c92ad4b29 100644
--- a/requirements/static/py3.5/raet-arch.txt
+++ b/requirements/static/py3.5/raet-arch.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -28,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -85,7 +89,8 @@ rsa==4.0                  # via google-auth
 s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/raet-centos-7.txt b/requirements/static/py3.5/raet-centos-7.txt
index 43ad10266a..8e7cff80c1 100644
--- a/requirements/static/py3.5/raet-centos-7.txt
+++ b/requirements/static/py3.5/raet-centos-7.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -28,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -94,7 +98,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/raet-debian-8.txt b/requirements/static/py3.5/raet-debian-8.txt
index 8cc6067520..670d2b87cc 100644
--- a/requirements/static/py3.5/raet-debian-8.txt
+++ b/requirements/static/py3.5/raet-debian-8.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -28,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -93,7 +97,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/raet-debian-9.txt b/requirements/static/py3.5/raet-debian-9.txt
index 2048cfa29e..1cb6fb9feb 100644
--- a/requirements/static/py3.5/raet-debian-9.txt
+++ b/requirements/static/py3.5/raet-debian-9.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -28,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -93,7 +97,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/raet-fedora-29.txt b/requirements/static/py3.5/raet-fedora-29.txt
index 46f4e0b622..08142ad7af 100644
--- a/requirements/static/py3.5/raet-fedora-29.txt
+++ b/requirements/static/py3.5/raet-fedora-29.txt
@@ -9,13 +9,15 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -29,6 +31,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -95,7 +99,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/raet-fedora-28.txt b/requirements/static/py3.5/raet-fedora-30.txt
similarity index 97%
rename from requirements/static/py3.5/raet-fedora-28.txt
rename to requirements/static/py3.5/raet-fedora-30.txt
index bee7858b30..f7a3d87520 100644
--- a/requirements/static/py3.5/raet-fedora-28.txt
+++ b/requirements/static/py3.5/raet-fedora-30.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.5/raet-fedora-28.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/fedora-28.in
+#    pip-compile -o requirements/static/py3.5/raet-fedora-30.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/fedora-30.in
 #
 apache-libcloud==2.0.0
 asn1crypto==0.24.0        # via cryptography
diff --git a/requirements/static/py3.5/raet-opensuse-42.txt b/requirements/static/py3.5/raet-opensuse-42.txt
deleted file mode 100644
index 5ebbd0b57a..0000000000
--- a/requirements/static/py3.5/raet-opensuse-42.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile -o requirements/static/py3.5/raet-opensuse-42.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/opensuse-42.in
-#
-apache-libcloud==2.0.0
-asn1crypto==0.24.0        # via cryptography
-atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-aws-xray-sdk==0.95        # via moto
-backports.functools-lru-cache==1.5  # via cheroot
-boto3==1.9.132
-boto==2.49.0
-botocore==1.12.132        # via boto3, moto, s3transfer
-cachetools==3.1.0         # via google-auth
-certifi==2019.3.9
-cffi==1.12.2
-chardet==3.0.4            # via requests
-cheroot==6.5.4            # via cherrypy
-cherrypy==17.3.0
-contextlib2==0.5.5        # via cherrypy
-coverage==4.5.3           # via pytest-cov
-croniter==0.3.29
-cryptography==2.6.1       # via moto, pyopenssl
-dnspython==1.16.0
-docker-pycreds==0.4.0     # via docker
-docker==3.7.2
-docutils==0.14            # via botocore
-ecdsa==0.13.2             # via python-jose
-future==0.17.1            # via python-jose
-gitdb2==2.0.5             # via gitpython
-gitpython==2.1.11
-google-auth==1.6.3        # via kubernetes
-hgtools==8.1.1
-idna==2.8                 # via requests
-ioflo==1.7.5
-ipaddress==1.0.22         # via kubernetes
-jaraco.functools==2.0     # via tempora
-jinja2==2.10.1
-jmespath==0.9.4           # via boto3, botocore
-jsondiff==1.1.1           # via moto
-jsonpickle==1.1           # via aws-xray-sdk
-jsonschema==2.6.0
-keyring==5.7.1
-kubernetes==3.0.0
-libnacl==1.6.1
-markupsafe==1.1.1
-mock==2.0.0 ; python_version < "3.6"
-more-itertools==5.0.0
-moto==1.3.7
-msgpack-python==0.5.6
-msgpack==0.6.1
-pathlib2==2.3.3           # via pytest
-pbr==5.1.3                # via mock
-pluggy==0.9.0             # via pytest
-portend==2.4              # via cherrypy
-psutil==5.6.1
-py==1.8.0                 # via pytest
-pyaml==19.4.1             # via moto
-pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5             # via pyasn1-modules, rsa
-pycparser==2.19           # via cffi
-pycryptodome==3.8.1
-pyinotify==0.9.6
-pyopenssl==19.0.0
-pytest-cov==2.6.1
-pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
-python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
-python-etcd==0.4.5
-python-gnupg==0.4.4
-python-jose==2.0.2        # via moto
-pytz==2019.1              # via moto, tempora
-pyvmomi==6.7.1.2018.12
-pyyaml==3.13
-raet==0.6.8
-requests==2.21.0
-responses==0.10.6         # via moto
-rfc3987==1.3.8
-rsa==4.0                  # via google-auth
-s3transfer==0.2.0         # via boto3
-salttesting==2017.6.1
-setproctitle==1.1.10
-setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
-smmap2==2.0.5             # via gitdb2
-strict-rfc3339==0.7
-tempora==1.14.1           # via portend
-timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
-urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
-virtualenv==16.4.3
-websocket-client==0.40.0  # via docker, kubernetes
-werkzeug==0.15.2          # via moto
-wrapt==1.11.1             # via aws-xray-sdk
-xmltodict==0.12.0         # via moto
-zc.lockfile==1.4          # via cherrypy
diff --git a/requirements/static/py3.5/raet-opensuse-leap-15.txt b/requirements/static/py3.5/raet-opensuse-leap-15.txt
index 3ea719951e..cd71f535bc 100644
--- a/requirements/static/py3.5/raet-opensuse-leap-15.txt
+++ b/requirements/static/py3.5/raet-opensuse-leap-15.txt
@@ -9,7 +9,9 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -28,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -87,7 +91,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/raet-osx.txt b/requirements/static/py3.5/raet-osx.txt
index c312a9b957..e76f22b049 100644
--- a/requirements/static/py3.5/raet-osx.txt
+++ b/requirements/static/py3.5/raet-osx.txt
@@ -9,9 +9,9 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl_match_hostname==3.7.0.1
-backports_abc==0.5
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
diff --git a/requirements/static/py3.5/raet-ubuntu-16.04.txt b/requirements/static/py3.5/raet-ubuntu-16.04.txt
index 72b297f9ee..f739ec24f9 100644
--- a/requirements/static/py3.5/raet-ubuntu-16.04.txt
+++ b/requirements/static/py3.5/raet-ubuntu-16.04.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -28,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -93,7 +97,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/raet-ubuntu-18.04.txt b/requirements/static/py3.5/raet-ubuntu-18.04.txt
index cb36aeae36..68c0e9ebf1 100644
--- a/requirements/static/py3.5/raet-ubuntu-18.04.txt
+++ b/requirements/static/py3.5/raet-ubuntu-18.04.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -28,6 +30,8 @@ docker-pycreds==0.4.0     # via docker
 docker==3.7.2
 docutils==0.14            # via botocore
 ecdsa==0.13.2             # via python-jose
+# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
+# enum34==1.1.6             # via raet
 future==0.17.1            # via python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11
@@ -93,7 +97,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/zeromq-amzn-2.txt b/requirements/static/py3.5/zeromq-amzn-2.txt
index c7c5b38aaa..332dd3ad72 100644
--- a/requirements/static/py3.5/zeromq-amzn-2.txt
+++ b/requirements/static/py3.5/zeromq-amzn-2.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -94,7 +96,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/zeromq-arch.txt b/requirements/static/py3.5/zeromq-arch.txt
index 2a160d3cdb..1ef356bc78 100644
--- a/requirements/static/py3.5/zeromq-arch.txt
+++ b/requirements/static/py3.5/zeromq-arch.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -85,7 +87,8 @@ rsa==4.0                  # via google-auth
 s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/zeromq-centos-7.txt b/requirements/static/py3.5/zeromq-centos-7.txt
index e2f9e2ed09..bcdc1be1d3 100644
--- a/requirements/static/py3.5/zeromq-centos-7.txt
+++ b/requirements/static/py3.5/zeromq-centos-7.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -94,7 +96,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/zeromq-debian-8.txt b/requirements/static/py3.5/zeromq-debian-8.txt
index b8aa25610c..868cb16163 100644
--- a/requirements/static/py3.5/zeromq-debian-8.txt
+++ b/requirements/static/py3.5/zeromq-debian-8.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -93,7 +95,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/zeromq-debian-9.txt b/requirements/static/py3.5/zeromq-debian-9.txt
index a5777f6c8e..fdd13a35e9 100644
--- a/requirements/static/py3.5/zeromq-debian-9.txt
+++ b/requirements/static/py3.5/zeromq-debian-9.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -93,7 +95,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/zeromq-fedora-29.txt b/requirements/static/py3.5/zeromq-fedora-29.txt
index ca3438311f..bafa63ba24 100644
--- a/requirements/static/py3.5/zeromq-fedora-29.txt
+++ b/requirements/static/py3.5/zeromq-fedora-29.txt
@@ -9,13 +9,15 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -95,7 +97,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/zeromq-fedora-28.txt b/requirements/static/py3.5/zeromq-fedora-30.txt
similarity index 97%
rename from requirements/static/py3.5/zeromq-fedora-28.txt
rename to requirements/static/py3.5/zeromq-fedora-30.txt
index e262cff32a..e0ffab87b4 100644
--- a/requirements/static/py3.5/zeromq-fedora-28.txt
+++ b/requirements/static/py3.5/zeromq-fedora-30.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.5/zeromq-fedora-28.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/fedora-28.in
+#    pip-compile -o requirements/static/py3.5/zeromq-fedora-30.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/fedora-30.in
 #
 apache-libcloud==2.0.0
 asn1crypto==0.24.0        # via cryptography
diff --git a/requirements/static/py3.5/zeromq-opensuse-42.txt b/requirements/static/py3.5/zeromq-opensuse-42.txt
deleted file mode 100644
index 357777ae72..0000000000
--- a/requirements/static/py3.5/zeromq-opensuse-42.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile -o requirements/static/py3.5/zeromq-opensuse-42.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/opensuse-42.in
-#
-apache-libcloud==2.0.0
-asn1crypto==0.24.0        # via cryptography
-atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-aws-xray-sdk==0.95        # via moto
-backports.functools-lru-cache==1.5  # via cheroot
-boto3==1.9.132
-boto==2.49.0
-botocore==1.12.132        # via boto3, moto, s3transfer
-cachetools==3.1.0         # via google-auth
-certifi==2019.3.9
-cffi==1.12.2
-chardet==3.0.4            # via requests
-cheroot==6.5.4            # via cherrypy
-cherrypy==17.3.0
-contextlib2==0.5.5        # via cherrypy
-coverage==4.5.3           # via pytest-cov
-croniter==0.3.29
-cryptography==2.6.1       # via moto, pyopenssl
-dnspython==1.16.0
-docker-pycreds==0.4.0     # via docker
-docker==3.7.2
-docutils==0.14            # via botocore
-ecdsa==0.13.2             # via python-jose
-future==0.17.1            # via python-jose
-gitdb2==2.0.5             # via gitpython
-gitpython==2.1.11
-google-auth==1.6.3        # via kubernetes
-hgtools==8.1.1
-idna==2.8                 # via requests
-ipaddress==1.0.22         # via kubernetes
-jaraco.functools==2.0     # via tempora
-jinja2==2.10.1
-jmespath==0.9.4           # via boto3, botocore
-jsondiff==1.1.1           # via moto
-jsonpickle==1.1           # via aws-xray-sdk
-jsonschema==2.6.0
-keyring==5.7.1
-kubernetes==3.0.0
-markupsafe==1.1.1
-mock==2.0.0 ; python_version < "3.6"
-more-itertools==5.0.0
-moto==1.3.7
-msgpack-python==0.5.6
-msgpack==0.6.1
-pathlib2==2.3.3           # via pytest
-pbr==5.1.3                # via mock
-pluggy==0.9.0             # via pytest
-portend==2.4              # via cherrypy
-psutil==5.6.1
-py==1.8.0                 # via pytest
-pyaml==19.4.1             # via moto
-pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5             # via pyasn1-modules, rsa
-pycparser==2.19           # via cffi
-# Next line explicitly commented out by pip-tools-compile because of the following regex: '^pycrypto==(.*)$'
-# pycrypto==2.6.1 ; sys_platform != "win32"
-pycryptodome==3.8.1
-pyinotify==0.9.6
-pyopenssl==19.0.0
-pytest-cov==2.6.1
-pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
-python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
-python-etcd==0.4.5
-python-gnupg==0.4.4
-python-jose==2.0.2        # via moto
-pytz==2019.1              # via moto, tempora
-pyvmomi==6.7.1.2018.12
-pyyaml==3.13
-pyzmq==18.0.1 ; python_version != "3.4"
-requests==2.21.0
-responses==0.10.6         # via moto
-rfc3987==1.3.8
-rsa==4.0                  # via google-auth
-s3transfer==0.2.0         # via boto3
-salttesting==2017.6.1
-setproctitle==1.1.10
-setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
-smmap2==2.0.5             # via gitdb2
-strict-rfc3339==0.7
-tempora==1.14.1           # via portend
-timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
-urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
-virtualenv==16.4.3
-websocket-client==0.40.0  # via docker, kubernetes
-werkzeug==0.15.2          # via moto
-wrapt==1.11.1             # via aws-xray-sdk
-xmltodict==0.12.0         # via moto
-zc.lockfile==1.4          # via cherrypy
diff --git a/requirements/static/py3.5/zeromq-opensuse-leap-15.txt b/requirements/static/py3.5/zeromq-opensuse-leap-15.txt
index a375ad3a04..33cc5337ce 100644
--- a/requirements/static/py3.5/zeromq-opensuse-leap-15.txt
+++ b/requirements/static/py3.5/zeromq-opensuse-leap-15.txt
@@ -9,7 +9,9 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -87,7 +89,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/zeromq-osx.txt b/requirements/static/py3.5/zeromq-osx.txt
index 3cbed0b808..8b02a655f4 100644
--- a/requirements/static/py3.5/zeromq-osx.txt
+++ b/requirements/static/py3.5/zeromq-osx.txt
@@ -9,9 +9,9 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl_match_hostname==3.7.0.1
-backports_abc==0.5
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
diff --git a/requirements/static/py3.5/zeromq-ubuntu-16.04.txt b/requirements/static/py3.5/zeromq-ubuntu-16.04.txt
index 263dfa9085..f2433c2455 100644
--- a/requirements/static/py3.5/zeromq-ubuntu-16.04.txt
+++ b/requirements/static/py3.5/zeromq-ubuntu-16.04.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -93,7 +95,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.5/zeromq-ubuntu-18.04.txt b/requirements/static/py3.5/zeromq-ubuntu-18.04.txt
index bc24b77c8c..aad60c17d2 100644
--- a/requirements/static/py3.5/zeromq-ubuntu-18.04.txt
+++ b/requirements/static/py3.5/zeromq-ubuntu-18.04.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -93,7 +95,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/raet-amzn-2.txt b/requirements/static/py3.6/raet-amzn-2.txt
index dd47f77b51..ce45046b6b 100644
--- a/requirements/static/py3.6/raet-amzn-2.txt
+++ b/requirements/static/py3.6/raet-amzn-2.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -95,7 +97,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/raet-arch.txt b/requirements/static/py3.6/raet-arch.txt
index 50460a8e8e..667f843ece 100644
--- a/requirements/static/py3.6/raet-arch.txt
+++ b/requirements/static/py3.6/raet-arch.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -86,7 +88,8 @@ rsa==4.0                  # via google-auth
 s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/raet-centos-7.txt b/requirements/static/py3.6/raet-centos-7.txt
index 89b754f327..c248a4abbd 100644
--- a/requirements/static/py3.6/raet-centos-7.txt
+++ b/requirements/static/py3.6/raet-centos-7.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -95,7 +97,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/raet-debian-8.txt b/requirements/static/py3.6/raet-debian-8.txt
index daa030e92b..5deb43431a 100644
--- a/requirements/static/py3.6/raet-debian-8.txt
+++ b/requirements/static/py3.6/raet-debian-8.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -94,7 +96,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/raet-debian-9.txt b/requirements/static/py3.6/raet-debian-9.txt
index ec76d7f8fe..6549a6323b 100644
--- a/requirements/static/py3.6/raet-debian-9.txt
+++ b/requirements/static/py3.6/raet-debian-9.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -94,7 +96,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/raet-fedora-29.txt b/requirements/static/py3.6/raet-fedora-29.txt
index bd81137986..8d08bea4fe 100644
--- a/requirements/static/py3.6/raet-fedora-29.txt
+++ b/requirements/static/py3.6/raet-fedora-29.txt
@@ -9,13 +9,15 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -96,7 +98,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/raet-fedora-28.txt b/requirements/static/py3.6/raet-fedora-30.txt
similarity index 97%
rename from requirements/static/py3.6/raet-fedora-28.txt
rename to requirements/static/py3.6/raet-fedora-30.txt
index 68187ee172..7747c8f5ee 100644
--- a/requirements/static/py3.6/raet-fedora-28.txt
+++ b/requirements/static/py3.6/raet-fedora-30.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.6/raet-fedora-28.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/fedora-28.in
+#    pip-compile -o requirements/static/py3.6/raet-fedora-30.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/fedora-30.in
 #
 apache-libcloud==2.0.0
 asn1crypto==0.24.0        # via cryptography
diff --git a/requirements/static/py3.6/raet-opensuse-42.txt b/requirements/static/py3.6/raet-opensuse-42.txt
deleted file mode 100644
index dbec77223b..0000000000
--- a/requirements/static/py3.6/raet-opensuse-42.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile -o requirements/static/py3.6/raet-opensuse-42.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/opensuse-42.in
-#
-apache-libcloud==2.0.0
-asn1crypto==0.24.0        # via cryptography
-atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-aws-xray-sdk==0.95        # via moto
-backports.functools-lru-cache==1.5  # via cheroot
-boto3==1.9.132
-boto==2.49.0
-botocore==1.12.132        # via boto3, moto, s3transfer
-cachetools==3.1.0         # via google-auth
-certifi==2019.3.9
-cffi==1.12.2
-chardet==3.0.4            # via requests
-cheroot==6.5.4            # via cherrypy
-cherrypy==17.3.0
-contextlib2==0.5.5        # via cherrypy
-coverage==4.5.3           # via pytest-cov
-croniter==0.3.29
-cryptography==2.6.1       # via moto, pyopenssl
-dnspython==1.16.0
-docker-pycreds==0.4.0     # via docker
-docker==3.7.2
-docutils==0.14            # via botocore
-ecdsa==0.13.2             # via python-jose
-# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
-# enum34==1.1.6             # via raet
-future==0.17.1            # via python-jose
-gitdb2==2.0.5             # via gitpython
-gitpython==2.1.11
-google-auth==1.6.3        # via kubernetes
-hgtools==8.1.1
-idna==2.8                 # via requests
-ioflo==1.7.5
-ipaddress==1.0.22         # via kubernetes
-jaraco.functools==2.0     # via tempora
-jinja2==2.10.1
-jmespath==0.9.4           # via boto3, botocore
-jsondiff==1.1.1           # via moto
-jsonpickle==1.1           # via aws-xray-sdk
-jsonschema==2.6.0
-keyring==5.7.1
-kubernetes==3.0.0
-libnacl==1.6.1
-markupsafe==1.1.1
-mock==2.0.0               # via moto
-more-itertools==5.0.0
-moto==1.3.7
-msgpack-python==0.5.6
-msgpack==0.6.1
-pbr==5.1.3                # via mock
-pluggy==0.9.0             # via pytest
-portend==2.4              # via cherrypy
-psutil==5.6.1
-py==1.8.0                 # via pytest
-pyaml==19.4.1             # via moto
-pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5             # via pyasn1-modules, rsa
-pycparser==2.19           # via cffi
-pycryptodome==3.8.1
-pyinotify==0.9.6
-pyopenssl==19.0.0
-pytest-cov==2.6.1
-pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
-python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
-python-etcd==0.4.5
-python-gnupg==0.4.4
-python-jose==2.0.2        # via moto
-pytz==2019.1              # via moto, tempora
-pyvmomi==6.7.1.2018.12
-pyyaml==3.13
-raet==0.6.8
-requests==2.21.0
-responses==0.10.6         # via moto
-rfc3987==1.3.8
-rsa==4.0                  # via google-auth
-s3transfer==0.2.0         # via boto3
-salttesting==2017.6.1
-setproctitle==1.1.10
-setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
-smmap2==2.0.5             # via gitdb2
-strict-rfc3339==0.7
-tempora==1.14.1           # via portend
-timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
-urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
-virtualenv==16.4.3
-websocket-client==0.40.0  # via docker, kubernetes
-werkzeug==0.15.2          # via moto
-wrapt==1.11.1             # via aws-xray-sdk
-xmltodict==0.12.0         # via moto
-zc.lockfile==1.4          # via cherrypy
diff --git a/requirements/static/py3.6/raet-opensuse-leap-15.txt b/requirements/static/py3.6/raet-opensuse-leap-15.txt
index 0101b29bf9..d02c1b85cb 100644
--- a/requirements/static/py3.6/raet-opensuse-leap-15.txt
+++ b/requirements/static/py3.6/raet-opensuse-leap-15.txt
@@ -9,7 +9,9 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -88,7 +90,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/raet-ubuntu-16.04.txt b/requirements/static/py3.6/raet-ubuntu-16.04.txt
index 9148ef4424..48de5cf692 100644
--- a/requirements/static/py3.6/raet-ubuntu-16.04.txt
+++ b/requirements/static/py3.6/raet-ubuntu-16.04.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -94,7 +96,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/raet-ubuntu-18.04.txt b/requirements/static/py3.6/raet-ubuntu-18.04.txt
index caea4d7ac2..c362a384b7 100644
--- a/requirements/static/py3.6/raet-ubuntu-18.04.txt
+++ b/requirements/static/py3.6/raet-ubuntu-18.04.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -94,7 +96,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/zeromq-amzn-2.txt b/requirements/static/py3.6/zeromq-amzn-2.txt
index d1c148f0cf..524306d894 100644
--- a/requirements/static/py3.6/zeromq-amzn-2.txt
+++ b/requirements/static/py3.6/zeromq-amzn-2.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -93,7 +95,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/zeromq-arch.txt b/requirements/static/py3.6/zeromq-arch.txt
index c01c91acbe..9bbc116cef 100644
--- a/requirements/static/py3.6/zeromq-arch.txt
+++ b/requirements/static/py3.6/zeromq-arch.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -84,7 +86,8 @@ rsa==4.0                  # via google-auth
 s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/zeromq-centos-7.txt b/requirements/static/py3.6/zeromq-centos-7.txt
index 643f1e9f5e..09acb209c7 100644
--- a/requirements/static/py3.6/zeromq-centos-7.txt
+++ b/requirements/static/py3.6/zeromq-centos-7.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -93,7 +95,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/zeromq-debian-8.txt b/requirements/static/py3.6/zeromq-debian-8.txt
index 5a956f8456..cd9f329f8d 100644
--- a/requirements/static/py3.6/zeromq-debian-8.txt
+++ b/requirements/static/py3.6/zeromq-debian-8.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -92,7 +94,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/zeromq-debian-9.txt b/requirements/static/py3.6/zeromq-debian-9.txt
index a3c1fcb0a6..95cf959ab9 100644
--- a/requirements/static/py3.6/zeromq-debian-9.txt
+++ b/requirements/static/py3.6/zeromq-debian-9.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -92,7 +94,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/zeromq-fedora-29.txt b/requirements/static/py3.6/zeromq-fedora-29.txt
index 0d52f69b8a..c99e206445 100644
--- a/requirements/static/py3.6/zeromq-fedora-29.txt
+++ b/requirements/static/py3.6/zeromq-fedora-29.txt
@@ -9,13 +9,15 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -94,7 +96,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/zeromq-fedora-28.txt b/requirements/static/py3.6/zeromq-fedora-30.txt
similarity index 97%
rename from requirements/static/py3.6/zeromq-fedora-28.txt
rename to requirements/static/py3.6/zeromq-fedora-30.txt
index 4700734b53..f4032ab36c 100644
--- a/requirements/static/py3.6/zeromq-fedora-28.txt
+++ b/requirements/static/py3.6/zeromq-fedora-30.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.6/zeromq-fedora-28.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/fedora-28.in
+#    pip-compile -o requirements/static/py3.6/zeromq-fedora-30.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/fedora-30.in
 #
 apache-libcloud==2.0.0
 asn1crypto==0.24.0        # via cryptography
diff --git a/requirements/static/py3.6/zeromq-opensuse-42.txt b/requirements/static/py3.6/zeromq-opensuse-42.txt
deleted file mode 100644
index 4083f93028..0000000000
--- a/requirements/static/py3.6/zeromq-opensuse-42.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile -o requirements/static/py3.6/zeromq-opensuse-42.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/opensuse-42.in
-#
-apache-libcloud==2.0.0
-asn1crypto==0.24.0        # via cryptography
-atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-aws-xray-sdk==0.95        # via moto
-backports.functools-lru-cache==1.5  # via cheroot
-boto3==1.9.132
-boto==2.49.0
-botocore==1.12.132        # via boto3, moto, s3transfer
-cachetools==3.1.0         # via google-auth
-certifi==2019.3.9
-cffi==1.12.2
-chardet==3.0.4            # via requests
-cheroot==6.5.4            # via cherrypy
-cherrypy==17.3.0
-contextlib2==0.5.5        # via cherrypy
-coverage==4.5.3           # via pytest-cov
-croniter==0.3.29
-cryptography==2.6.1       # via moto, pyopenssl
-dnspython==1.16.0
-docker-pycreds==0.4.0     # via docker
-docker==3.7.2
-docutils==0.14            # via botocore
-ecdsa==0.13.2             # via python-jose
-future==0.17.1            # via python-jose
-gitdb2==2.0.5             # via gitpython
-gitpython==2.1.11
-google-auth==1.6.3        # via kubernetes
-hgtools==8.1.1
-idna==2.8                 # via requests
-ipaddress==1.0.22         # via kubernetes
-jaraco.functools==2.0     # via tempora
-jinja2==2.10.1
-jmespath==0.9.4           # via boto3, botocore
-jsondiff==1.1.1           # via moto
-jsonpickle==1.1           # via aws-xray-sdk
-jsonschema==2.6.0
-keyring==5.7.1
-kubernetes==3.0.0
-markupsafe==1.1.1
-mock==2.0.0               # via moto
-more-itertools==5.0.0
-moto==1.3.7
-msgpack-python==0.5.6
-msgpack==0.6.1
-pbr==5.1.3                # via mock
-pluggy==0.9.0             # via pytest
-portend==2.4              # via cherrypy
-psutil==5.6.1
-py==1.8.0                 # via pytest
-pyaml==19.4.1             # via moto
-pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5             # via pyasn1-modules, rsa
-pycparser==2.19           # via cffi
-# Next line explicitly commented out by pip-tools-compile because of the following regex: '^pycrypto==(.*)$'
-# pycrypto==2.6.1 ; sys_platform != "win32"
-pycryptodome==3.8.1
-pyinotify==0.9.6
-pyopenssl==19.0.0
-pytest-cov==2.6.1
-pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
-python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
-python-etcd==0.4.5
-python-gnupg==0.4.4
-python-jose==2.0.2        # via moto
-pytz==2019.1              # via moto, tempora
-pyvmomi==6.7.1.2018.12
-pyyaml==3.13
-pyzmq==18.0.1 ; python_version != "3.4"
-requests==2.21.0
-responses==0.10.6         # via moto
-rfc3987==1.3.8
-rsa==4.0                  # via google-auth
-s3transfer==0.2.0         # via boto3
-salttesting==2017.6.1
-setproctitle==1.1.10
-setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
-smmap2==2.0.5             # via gitdb2
-strict-rfc3339==0.7
-tempora==1.14.1           # via portend
-timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
-urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
-virtualenv==16.4.3
-websocket-client==0.40.0  # via docker, kubernetes
-werkzeug==0.15.2          # via moto
-wrapt==1.11.1             # via aws-xray-sdk
-xmltodict==0.12.0         # via moto
-zc.lockfile==1.4          # via cherrypy
diff --git a/requirements/static/py3.6/zeromq-opensuse-leap-15.txt b/requirements/static/py3.6/zeromq-opensuse-leap-15.txt
index 3a7f765c71..5434a3a91f 100644
--- a/requirements/static/py3.6/zeromq-opensuse-leap-15.txt
+++ b/requirements/static/py3.6/zeromq-opensuse-leap-15.txt
@@ -9,7 +9,9 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -86,7 +88,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/zeromq-ubuntu-16.04.txt b/requirements/static/py3.6/zeromq-ubuntu-16.04.txt
index d9890fba84..8f17d73e04 100644
--- a/requirements/static/py3.6/zeromq-ubuntu-16.04.txt
+++ b/requirements/static/py3.6/zeromq-ubuntu-16.04.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -92,7 +94,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/zeromq-ubuntu-18.04.txt b/requirements/static/py3.6/zeromq-ubuntu-18.04.txt
index e2d0947606..22159e3b00 100644
--- a/requirements/static/py3.6/zeromq-ubuntu-18.04.txt
+++ b/requirements/static/py3.6/zeromq-ubuntu-18.04.txt
@@ -9,12 +9,14 @@ asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
+backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
+backports.ssl-match-hostname==3.7.0.1  # via websocket-client
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
 cachetools==3.1.0         # via google-auth
-certifi==2019.3.9         # via kubernetes, requests
+certifi==2019.3.9         # via kubernetes, requests, tornado
 cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
@@ -92,7 +94,8 @@ s3transfer==0.2.0         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, websocket-client
+singledispatch==3.4.0.3   # via tornado
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.7/raet-fedora-28.txt b/requirements/static/py3.7/raet-fedora-30.txt
similarity index 97%
rename from requirements/static/py3.7/raet-fedora-28.txt
rename to requirements/static/py3.7/raet-fedora-30.txt
index c285a84aba..dfc483a722 100644
--- a/requirements/static/py3.7/raet-fedora-28.txt
+++ b/requirements/static/py3.7/raet-fedora-30.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.7/raet-fedora-28.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/fedora-28.in
+#    pip-compile -o requirements/static/py3.7/raet-fedora-30.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/fedora-30.in
 #
 apache-libcloud==2.0.0
 asn1crypto==0.24.0        # via cryptography
diff --git a/requirements/static/py3.7/raet-opensuse-42.txt b/requirements/static/py3.7/raet-opensuse-42.txt
deleted file mode 100644
index fab78bda0c..0000000000
--- a/requirements/static/py3.7/raet-opensuse-42.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile -o requirements/static/py3.7/raet-opensuse-42.txt -v requirements/base.txt requirements/raet.txt requirements/pytest.txt requirements/static/opensuse-42.in
-#
-apache-libcloud==2.0.0
-asn1crypto==0.24.0        # via cryptography
-atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-aws-xray-sdk==0.95        # via moto
-backports-abc==0.5        # via tornado
-backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via websocket-client
-boto3==1.9.132
-boto==2.49.0
-botocore==1.12.132        # via boto3, moto, s3transfer
-cachetools==3.1.0         # via google-auth
-certifi==2019.3.9
-cffi==1.12.2
-chardet==3.0.4            # via requests
-cheroot==6.5.4            # via cherrypy
-cherrypy==17.3.0
-contextlib2==0.5.5        # via cherrypy
-coverage==4.5.3           # via pytest-cov
-croniter==0.3.29
-cryptography==2.6.1       # via moto, pyopenssl
-dnspython==1.16.0
-docker-pycreds==0.4.0     # via docker
-docker==3.7.2
-docutils==0.14            # via botocore
-ecdsa==0.13.2             # via python-jose
-# Next line explicitly commented out by pip-tools-compile because of the following regex: '^enum34==(.*)$'
-# enum34==1.1.6             # via raet
-future==0.17.1            # via python-jose
-gitdb2==2.0.5             # via gitpython
-gitpython==2.1.11
-google-auth==1.6.3        # via kubernetes
-hgtools==8.1.1
-idna==2.8                 # via requests
-ioflo==1.7.5
-ipaddress==1.0.22         # via kubernetes
-jaraco.functools==2.0     # via tempora
-jinja2==2.10.1
-jmespath==0.9.4           # via boto3, botocore
-jsondiff==1.1.1           # via moto
-jsonpickle==1.1           # via aws-xray-sdk
-jsonschema==2.6.0
-keyring==5.7.1
-kubernetes==3.0.0
-libnacl==1.6.1
-markupsafe==1.1.1
-mock==2.0.0               # via moto
-more-itertools==5.0.0
-moto==1.3.7
-msgpack-python==0.5.6
-msgpack==0.6.1
-pbr==5.1.3                # via mock
-pluggy==0.9.0             # via pytest
-portend==2.4              # via cherrypy
-psutil==5.6.1
-py==1.8.0                 # via pytest
-pyaml==19.4.1             # via moto
-pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5             # via pyasn1-modules, rsa
-pycparser==2.19           # via cffi
-pycryptodome==3.8.1
-pyinotify==0.9.6
-pyopenssl==19.0.0
-pytest-cov==2.6.1
-pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
-python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
-python-etcd==0.4.5
-python-gnupg==0.4.4
-python-jose==2.0.2        # via moto
-pytz==2019.1              # via moto, tempora
-pyvmomi==6.7.1.2018.12
-pyyaml==3.13
-raet==0.6.8
-requests==2.21.0
-responses==0.10.6         # via moto
-rfc3987==1.3.8
-rsa==4.0                  # via google-auth
-s3transfer==0.2.0         # via boto3
-salttesting==2017.6.1
-setproctitle==1.1.10
-setuptools-scm==3.2.0
-singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
-smmap2==2.0.5             # via gitdb2
-strict-rfc3339==0.7
-tempora==1.14.1           # via portend
-timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
-urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
-virtualenv==16.4.3
-websocket-client==0.40.0  # via docker, kubernetes
-werkzeug==0.15.2          # via moto
-wrapt==1.11.1             # via aws-xray-sdk
-xmltodict==0.12.0         # via moto
-zc.lockfile==1.4          # via cherrypy
diff --git a/requirements/static/py3.7/zeromq-fedora-28.txt b/requirements/static/py3.7/zeromq-fedora-30.txt
similarity index 97%
rename from requirements/static/py3.7/zeromq-fedora-28.txt
rename to requirements/static/py3.7/zeromq-fedora-30.txt
index eb3ce16a27..35da068f5c 100644
--- a/requirements/static/py3.7/zeromq-fedora-28.txt
+++ b/requirements/static/py3.7/zeromq-fedora-30.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.7/zeromq-fedora-28.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/fedora-28.in
+#    pip-compile -o requirements/static/py3.7/zeromq-fedora-30.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/fedora-30.in
 #
 apache-libcloud==2.0.0
 asn1crypto==0.24.0        # via cryptography
diff --git a/requirements/static/py3.7/zeromq-opensuse-42.txt b/requirements/static/py3.7/zeromq-opensuse-42.txt
deleted file mode 100644
index 525e2ea531..0000000000
--- a/requirements/static/py3.7/zeromq-opensuse-42.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile -o requirements/static/py3.7/zeromq-opensuse-42.txt -v requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/opensuse-42.in
-#
-apache-libcloud==2.0.0
-asn1crypto==0.24.0        # via cryptography
-atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-aws-xray-sdk==0.95        # via moto
-backports-abc==0.5        # via tornado
-backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl-match-hostname==3.7.0.1  # via websocket-client
-boto3==1.9.132
-boto==2.49.0
-botocore==1.12.132        # via boto3, moto, s3transfer
-cachetools==3.1.0         # via google-auth
-certifi==2019.3.9
-cffi==1.12.2
-chardet==3.0.4            # via requests
-cheroot==6.5.4            # via cherrypy
-cherrypy==17.3.0
-contextlib2==0.5.5        # via cherrypy
-coverage==4.5.3           # via pytest-cov
-croniter==0.3.29
-cryptography==2.6.1       # via moto, pyopenssl
-dnspython==1.16.0
-docker-pycreds==0.4.0     # via docker
-docker==3.7.2
-docutils==0.14            # via botocore
-ecdsa==0.13.2             # via python-jose
-future==0.17.1            # via python-jose
-gitdb2==2.0.5             # via gitpython
-gitpython==2.1.11
-google-auth==1.6.3        # via kubernetes
-hgtools==8.1.1
-idna==2.8                 # via requests
-ipaddress==1.0.22         # via kubernetes
-jaraco.functools==2.0     # via tempora
-jinja2==2.10.1
-jmespath==0.9.4           # via boto3, botocore
-jsondiff==1.1.1           # via moto
-jsonpickle==1.1           # via aws-xray-sdk
-jsonschema==2.6.0
-keyring==5.7.1
-kubernetes==3.0.0
-markupsafe==1.1.1
-mock==2.0.0               # via moto
-more-itertools==5.0.0
-moto==1.3.7
-msgpack-python==0.5.6
-msgpack==0.6.1
-pbr==5.1.3                # via mock
-pluggy==0.9.0             # via pytest
-portend==2.4              # via cherrypy
-psutil==5.6.1
-py==1.8.0                 # via pytest
-pyaml==19.4.1             # via moto
-pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5             # via pyasn1-modules, rsa
-pycparser==2.19           # via cffi
-# Next line explicitly commented out by pip-tools-compile because of the following regex: '^pycrypto==(.*)$'
-# pycrypto==2.6.1 ; sys_platform != "win32"
-pycryptodome==3.8.1
-pyinotify==0.9.6
-pyopenssl==19.0.0
-pytest-cov==2.6.1
-pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
-python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
-python-etcd==0.4.5
-python-gnupg==0.4.4
-python-jose==2.0.2        # via moto
-pytz==2019.1              # via moto, tempora
-pyvmomi==6.7.1.2018.12
-pyyaml==3.13
-pyzmq==18.0.1 ; python_version != "3.4"
-requests==2.21.0
-responses==0.10.6         # via moto
-rfc3987==1.3.8
-rsa==4.0                  # via google-auth
-s3transfer==0.2.0         # via boto3
-salttesting==2017.6.1
-setproctitle==1.1.10
-setuptools-scm==3.2.0
-singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
-smmap2==2.0.5             # via gitdb2
-strict-rfc3339==0.7
-tempora==1.14.1           # via portend
-timelib==0.2.4
-tornado==4.5.3 ; python_version >= "3.4"
-urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
-virtualenv==16.4.3
-websocket-client==0.40.0  # via docker, kubernetes
-werkzeug==0.15.2          # via moto
-wrapt==1.11.1             # via aws-xray-sdk
-xmltodict==0.12.0         # via moto
-zc.lockfile==1.4          # via cherrypy
diff --git a/salt/modules/win_dism.py b/salt/modules/win_dism.py
index a5f7a97978..2772ba61b4 100644
--- a/salt/modules/win_dism.py
+++ b/salt/modules/win_dism.py
@@ -8,8 +8,9 @@ Windows 10.
 from __future__ import absolute_import, unicode_literals, print_function
 
 # Import Python libs
-import re
 import logging
+import os
+import re
 
 # Import Salt libs
 import salt.utils.platform
@@ -21,6 +22,27 @@ from salt.ext import six
 log = logging.getLogger(__name__)
 __virtualname__ = "dism"
 
+# We always want to use the version of dism that matches the architecture of the
+# host machine. On 32bit boxes that will always be System32. On 64bit boxes that
+# are running 64bit salt that will always be System32. On 64bit boxes that are
+# running 32bit salt the 64bit dism will be found in SysNative
+# Sysnative is a virtual folder, a special alias, that can be used to access the
+# 64-bit System32 folder from a 32-bit application
+try:
+    # This does not apply to Non-Windows platforms
+    if not salt.utils.platform.is_windows():
+        raise OSError
+
+    if os.path.exists(os.path.join(os.environ.get('SystemRoot'), 'SysNative')):
+        bin_path = os.path.join(os.environ.get('SystemRoot'), 'SysNative')
+    else:
+        bin_path = os.path.join(os.environ.get('SystemRoot'), 'System32')
+    bin_dism = os.path.join(bin_path, 'dism.exe')
+
+except OSError:
+    log.trace('win_dism: Non-Windows system')
+    bin_dism = 'dism.exe'
+
 
 def __virtual__():
     '''
@@ -33,7 +55,7 @@ def __virtual__():
 
 
 def _get_components(type_regex, plural_type, install_value, image=None):
-    cmd = ['DISM',
+    cmd = [bin_dism,
            '/English',
            '/Image:{0}'.format(image) if image else '/Online',
            '/Get-{0}'.format(plural_type)]
@@ -82,7 +104,7 @@ def add_capability(capability,
             '`install_capability` is not available on this version of Windows: '
             '{0}'.format(__grains__['osversion']))
 
-    cmd = ['DISM',
+    cmd = [bin_dism,
            '/Quiet',
            '/Image:{0}'.format(image) if image else '/Online',
            '/Add-Capability',
@@ -127,7 +149,7 @@ def remove_capability(capability, image=None, restart=False):
             '`uninstall_capability` is not available on this version of '
             'Windows: {0}'.format(__grains__['osversion']))
 
-    cmd = ['DISM',
+    cmd = [bin_dism,
            '/Quiet',
            '/Image:{0}'.format(image) if image else '/Online',
            '/Remove-Capability',
@@ -166,7 +188,7 @@ def get_capabilities(image=None):
             '`installed_capabilities` is not available on this version of '
             'Windows: {0}'.format(__grains__['osversion']))
 
-    cmd = ['DISM',
+    cmd = [bin_dism,
            '/English',
            '/Image:{0}'.format(image) if image else '/Online',
            '/Get-Capabilities']
@@ -272,7 +294,7 @@ def add_feature(feature,
 
         salt '*' dism.add_feature NetFx3
     '''
-    cmd = ['DISM',
+    cmd = [bin_dism,
            '/Quiet',
            '/Image:{0}'.format(image) if image else '/Online',
            '/Enable-Feature',
@@ -313,7 +335,7 @@ def remove_feature(feature, remove_payload=False, image=None, restart=False):
 
         salt '*' dism.remove_feature NetFx3
     '''
-    cmd = ['DISM',
+    cmd = [bin_dism,
            '/Quiet',
            '/Image:{0}'.format(image) if image else '/Online',
            '/Disable-Feature',
@@ -359,7 +381,7 @@ def get_features(package=None, image=None):
             # Return all features in the calc package
             salt '*' dism.get_features Microsoft.Windows.Calc.Demo~6595b6144ccf1df~x86~en~1.0.0.0
     '''
-    cmd = ['DISM',
+    cmd = [bin_dism,
            '/English',
            '/Image:{0}'.format(image) if image else '/Online',
            '/Get-Features']
@@ -461,7 +483,7 @@ def add_package(package,
 
         salt '*' dism.add_package C:\\Packages\\package.cab
     '''
-    cmd = ['DISM',
+    cmd = [bin_dism,
            '/Quiet',
            '/Image:{0}'.format(image) if image else '/Online',
            '/Add-Package',
@@ -504,7 +526,7 @@ def remove_package(package, image=None, restart=False):
         # Remove the package.cab (does not remove C:\\packages\\package.cab)
         salt '*' dism.remove_package C:\\packages\\package.cab
     '''
-    cmd = ['DISM',
+    cmd = [bin_dism,
            '/Quiet',
            '/Image:{0}'.format(image) if image else '/Online',
            '/Remove-Package']
@@ -563,7 +585,7 @@ def package_info(package, image=None):
 
         salt '*' dism. package_info C:\\packages\\package.cab
     '''
-    cmd = ['DISM',
+    cmd = [bin_dism,
            '/English',
            '/Image:{0}'.format(image) if image else '/Online',
            '/Get-PackageInfo']
diff --git a/salt/modules/win_lgpo.py b/salt/modules/win_lgpo.py
index fadab5f407..faf210cc4f 100644
--- a/salt/modules/win_lgpo.py
+++ b/salt/modules/win_lgpo.py
@@ -5728,6 +5728,18 @@ def _checkValueItemParent(policy_element, policy_name, policy_key,
     return False
 
 
+def _encode_string(value):
+    encoded_null = chr(0).encode('utf-16-le')
+    if value is None:
+        return encoded_null
+    else:
+        # Should we raise an error here, or attempt to cast to a string
+        if not isinstance(value, six.string_types):
+            raise TypeError('Value {0} is not a string type\n'
+                            'Type: {1}'.format(repr(value), type(value)))
+        return b''.join([value.encode('utf-16-le'), encoded_null])
+
+
 def _buildKnownDataSearchString(reg_key, reg_valueName, reg_vtype, reg_data,
                                 check_deleted=False):
     '''
@@ -5749,8 +5761,7 @@ def _buildKnownDataSearchString(reg_key, reg_valueName, reg_vtype, reg_data,
         elif reg_vtype == "REG_QWORD":
             this_element_value = struct.pack(b'Q', int(reg_data))
         elif reg_vtype == 'REG_SZ':
-            this_element_value = b''.join([reg_data.encode('utf-16-le'),
-                                           encoded_null])
+            this_element_value = _encode_string(reg_data)
     if check_deleted:
         reg_vtype = 'REG_SZ'
         expected_string = b''.join(['['.encode('utf-16-le'),
@@ -5845,8 +5856,7 @@ def _processValueItem(element, reg_key, reg_valuename, policy, parent_element,
             return None
     elif etree.QName(element).localname == 'string':
         this_vtype = 'REG_SZ'
-        this_element_value = b''.join([element.text.encode('utf-16-le'),
-                                       encoded_null])
+        this_element_value = _encode_string(element.text)
     elif etree.QName(parent_element).localname == 'elements':
         standard_element_expected_string = True
         if etree.QName(element).localname == 'boolean':
@@ -5889,9 +5899,7 @@ def _processValueItem(element, reg_key, reg_valuename, policy, parent_element,
             if 'expandable' in element.attrib:
                 if element.attrib['expandable'].lower() == 'true':
                     this_vtype = 'REG_EXPAND_SZ'
-            if this_element_value is not None:
-                this_element_value = b''.join([this_element_value.encode('utf-16-le'),
-                                               encoded_null])
+            this_element_value = _encode_string(this_element_value)
         elif etree.QName(element).localname == 'multiText':
             this_vtype = 'REG_MULTI_SZ' if not check_deleted else 'REG_SZ'
             if this_element_value is not None:
@@ -5959,8 +5967,7 @@ def _processValueItem(element, reg_key, reg_valuename, policy, parent_element,
                                                                       six.unichr(len('{0}{1}'.format(element_values[i],
                                                                                  chr(0)).encode('utf-16-le'))).encode('utf-32-le'),
                                                                       encoded_semicolon,
-                                                                      b''.join([element_values[i].encode('utf-16-le'),
-                                                                               encoded_null]),
+                                                                      _encode_string(element_values[i]),
                                                                       ']'.encode('utf-16-le')])
                 else:
                     expected_string = del_keys + b''.join(['['.encode('utf-16-le'),
diff --git a/salt/states/win_lgpo.py b/salt/states/win_lgpo.py
index 2b4e884ca5..8645f4420d 100644
--- a/salt/states/win_lgpo.py
+++ b/salt/states/win_lgpo.py
@@ -127,6 +127,28 @@ def __virtual__():
     return __virtualname__ if 'lgpo.set' in __salt__ else False
 
 
+def _compare_policies(new_policy, current_policy):
+    '''
+    Helper function that returns ``True`` if the policies are the same,
+    otherwise ``False``
+    '''
+    # Compared dicts, lists, and strings
+    if isinstance(new_policy, six.string_types):
+        return new_policy == current_policy
+    elif isinstance(new_policy, list):
+        if isinstance(current_policy, list):
+            return salt.utils.data.compare_lists(new_policy,
+                                                 current_policy) == {}
+        else:
+            return False
+    elif isinstance(new_policy, dict):
+        if isinstance(current_policy, dict):
+            return salt.utils.data.compare_dicts(new_policy,
+                                                 current_policy) == {}
+        else:
+            return False
+
+
 def set_(name,
          setting=None,
          policy_class=None,
@@ -278,24 +300,13 @@ def set_(name,
                     changes = False
                     requested_policy_json = salt.utils.json.dumps(policy_data['requested_policy'][policy_name], sort_keys=True).lower()
                     current_policy_json = salt.utils.json.dumps(current_policy[policy_data['output_section']][pol_id], sort_keys=True).lower()
-                    policies_are_equal = False
 
                     requested_policy_check = salt.utils.json.loads(requested_policy_json)
                     current_policy_check = salt.utils.json.loads(current_policy_json)
 
-                    # Compared dicts, lists, and strings
-                    if isinstance(requested_policy_check, six.string_types):
-                        policies_are_equal = requested_policy_check == current_policy_check
-                    elif isinstance(requested_policy_check, list):
-                        policies_are_equal = salt.utils.data.compare_lists(
-                            requested_policy_check,
-                            current_policy_check
-                        ) == {}
-                    elif isinstance(requested_policy_check, dict):
-                        policies_are_equal = salt.utils.data.compare_dicts(
-                            requested_policy_check,
-                            current_policy_check
-                        ) == {}
+                    # Are the requested and current policies identical
+                    policies_are_equal = _compare_policies(
+                        requested_policy_check, current_policy_check)
 
                     if not policies_are_equal:
                         additional_policy_comments = []
diff --git a/salt/utils/minions.py b/salt/utils/minions.py
index 2ec7f9acd1..a24f293701 100644
--- a/salt/utils/minions.py
+++ b/salt/utils/minions.py
@@ -47,6 +47,37 @@ TARGET_REX = re.compile(
     )
 
 
+def _nodegroup_regex(nodegroup, words, opers):
+    opers_set = set(opers)
+    ret = words
+    if (set(ret) - opers_set) == set(ret):
+        # No compound operators found in nodegroup definition. Check for
+        # group type specifiers
+        group_type_re = re.compile('^[A-Z]@')
+        regex_chars = ['(', '[', '{', '\\', '?', '}', ']', ')']
+        if not [x for x in ret if '*' in x or group_type_re.match(x)]:
+            # No group type specifiers and no wildcards.
+            # Treat this as an expression.
+            if [x for x in ret if x in [x for y in regex_chars if y in x]]:
+                joined = 'E@' + ','.join(ret)
+                log.debug(
+                    'Nodegroup \'%s\' (%s) detected as an expression. '
+                    'Assuming compound matching syntax of \'%s\'',
+                    nodegroup, ret, joined
+                )
+            else:
+                # Treat this as a list of nodenames.
+                joined = 'L@' + ','.join(ret)
+                log.debug(
+                    'Nodegroup \'%s\' (%s) detected as list of nodenames. '
+                    'Assuming compound matching syntax of \'%s\'',
+                    nodegroup, ret, joined
+                )
+            # Return data must be a list of compound matching components
+            # to be fed into compound matcher. Enclose return data in list.
+            return [joined]
+
+
 def parse_target(target_expression):
     '''Parse `target_expressing` splitting it into `engine`, `delimiter`,
      `pattern` - returns a dict'''
@@ -141,36 +172,16 @@ def nodegroup_comp(nodegroup, nodegroups, skip=None, first_call=True):
     # Only return list form if a nodegroup was expanded. Otherwise return
     # the original string to conserve backwards compat
     if expanded_nodegroup or not first_call:
+        if not first_call:
+            joined = _nodegroup_regex(nodegroup, words, opers)
+            if joined:
+                return joined
         return ret
     else:
-        opers_set = set(opers)
         ret = words
-        if (set(ret) - opers_set) == set(ret):
-            # No compound operators found in nodegroup definition. Check for
-            # group type specifiers
-            group_type_re = re.compile('^[A-Z]@')
-            regex_chars = ['(', '[', '{', '\\', '?', '}', ']', ')']
-            if not [x for x in ret if '*' in x or group_type_re.match(x)]:
-                # No group type specifiers and no wildcards.
-                # Treat this as an expression.
-                if [x for x in ret if x in [x for y in regex_chars if y in x]]:
-                    joined = 'E@' + ','.join(ret)
-                    log.debug(
-                        'Nodegroup \'%s\' (%s) detected as an expression. '
-                        'Assuming compound matching syntax of \'%s\'',
-                        nodegroup, ret, joined
-                    )
-                else:
-                    # Treat this as a list of nodenames.
-                    joined = 'L@' + ','.join(ret)
-                    log.debug(
-                        'Nodegroup \'%s\' (%s) detected as list of nodenames. '
-                        'Assuming compound matching syntax of \'%s\'',
-                        nodegroup, ret, joined
-                    )
-                # Return data must be a list of compound matching components
-                # to be fed into compound matcher. Enclose return data in list.
-                return [joined]
+        joined = _nodegroup_regex(nodegroup, ret, opers)
+        if joined:
+            return joined
 
         log.debug(
             'No nested nodegroups detected. Using original nodegroup '
diff --git a/setup.py b/setup.py
index 4a6813e6c8..3e930df8db 100755
--- a/setup.py
+++ b/setup.py
@@ -776,8 +776,9 @@ class SaltDistribution(distutils.dist.Distribution):
         * salt-call
         * salt-cp
         * salt-minion
+        * salt-syndic
         * salt-unity
-        * salt-proxy
+        * spm
 
     When packaged for salt-ssh, the following scripts should be installed:
         * salt-call
@@ -785,7 +786,8 @@ class SaltDistribution(distutils.dist.Distribution):
         * salt-ssh
         * salt-cloud
 
-        Under windows, the following scripts should be omitted from the salt-ssh package:
+        Under windows, the following scripts should be omitted from the salt-ssh
+        package:
             * salt-cloud
             * salt-run
 
@@ -980,10 +982,10 @@ class SaltDistribution(distutils.dist.Distribution):
         if IS_WINDOWS_PLATFORM:
             data_files[0][1].extend(['doc/man/salt-cp.1',
                                      'doc/man/salt-key.1',
-                                     'doc/man/salt-master.1',
                                      'doc/man/salt-minion.1',
-                                     'doc/man/salt-proxy.1',
-                                     'doc/man/salt-unity.1'])
+                                     'doc/man/salt-syndic.1',
+                                     'doc/man/salt-unity.1',
+                                     'doc/man/spm.1'])
             return data_files
 
         # *nix, so, we need all man pages
@@ -1032,13 +1034,12 @@ class SaltDistribution(distutils.dist.Distribution):
             return scripts
 
         if IS_WINDOWS_PLATFORM:
-            scripts.extend(['scripts/salt',
-                            'scripts/salt-cp',
+            scripts.extend(['scripts/salt-cp',
                             'scripts/salt-key',
-                            'scripts/salt-master',
                             'scripts/salt-minion',
-                            'scripts/salt-proxy',
-                            'scripts/salt-unity'])
+                            'scripts/salt-syndic',
+                            'scripts/salt-unity',
+                            'scripts/spm'])
             return scripts
 
         # *nix, so, we need all scripts
@@ -1049,10 +1050,10 @@ class SaltDistribution(distutils.dist.Distribution):
                         'scripts/salt-key',
                         'scripts/salt-master',
                         'scripts/salt-minion',
+                        'scripts/salt-proxy',
                         'scripts/salt-ssh',
                         'scripts/salt-syndic',
                         'scripts/salt-unity',
-                        'scripts/salt-proxy',
                         'scripts/spm'])
         return scripts
 
@@ -1069,11 +1070,10 @@ class SaltDistribution(distutils.dist.Distribution):
             return {'console_scripts': scripts}
 
         if IS_WINDOWS_PLATFORM:
-            scripts.extend(['salt = salt.scripts:salt_main',
-                            'salt-cp = salt.scripts:salt_cp',
+            scripts.extend(['salt-cp = salt.scripts:salt_cp',
                             'salt-key = salt.scripts:salt_key',
-                            'salt-master = salt.scripts:salt_master',
                             'salt-minion = salt.scripts:salt_minion',
+                            'salt-syndic = salt.scripts:salt_syndic',
                             'salt-unity = salt.scripts:salt_unity',
                             'spm = salt.scripts:salt_spm'])
             return {'console_scripts': scripts}
diff --git a/tests/integration/cloud/clouds/test_digitalocean.py b/tests/integration/cloud/clouds/test_digitalocean.py
index d7b0aa84e0..4206d5aa58 100644
--- a/tests/integration/cloud/clouds/test_digitalocean.py
+++ b/tests/integration/cloud/clouds/test_digitalocean.py
@@ -102,15 +102,15 @@ class DigitalOceanTest(ShellCase):
         pub = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAQQDDHr/jh2Jy4yALcK4JyWbVkPRaWmhck3IgCoeOO3z1e2dBowLh64QAM+Qb72pxekALga2oi4GvT+TlWNhzPH4V example'
         finger_print = '3b:16:bf:e4:8b:00:8b:b8:59:8c:a9:d3:f0:19:45:fa'
 
-        _key = self.run_cloud('-f create_key {0} name="MyPubKey" public_key="{1}"'.format(PROVIDER_NAME, pub))
-
-        # Upload public key
-        self.assertIn(
-            finger_print,
-            [i.strip() for i in _key]
-        )
-
         try:
+            _key = self.run_cloud('-f create_key {0} name="MyPubKey" public_key="{1}"'.format(PROVIDER_NAME, pub))
+
+            # Upload public key
+            self.assertIn(
+                finger_print,
+                [i.strip() for i in _key]
+            )
+
             # List all keys
             list_keypairs = self.run_cloud('-f list_keypairs {0}'.format(PROVIDER_NAME))
 
diff --git a/tests/integration/files/conf/master b/tests/integration/files/conf/master
index 4c23eb3361..1b639a522d 100644
--- a/tests/integration/files/conf/master
+++ b/tests/integration/files/conf/master
@@ -70,14 +70,22 @@ nodegroups:
   min: minion
   sub_min: sub_minion
   mins: N@min or N@sub_min
+  list_nodegroup:
+    - 'minion'
+    - 'sub_minion'
   multiline_nodegroup:
     - 'minion'
     - 'or'
     - 'sub_minion'
+  one_minion_list:
+    - 'minion'
   redundant_minions: N@min or N@mins
   nodegroup_loop_a: N@nodegroup_loop_b
   nodegroup_loop_b: N@nodegroup_loop_a
   missing_minion: L@minion,ghostminion
+  list_group: N@multiline_nodegroup
+  one_list_group: N@one_minion_list
+  list_group2: N@list_nodegroup
 
 
 mysql.host: localhost
diff --git a/tests/integration/modules/test_mac_power.py b/tests/integration/modules/test_mac_power.py
index ea0cfa69b9..8c170f4756 100644
--- a/tests/integration/modules/test_mac_power.py
+++ b/tests/integration/modules/test_mac_power.py
@@ -17,7 +17,7 @@ import salt.utils.platform
 
 
 @skip_if_not_root
-@flaky
+@flaky(attempts=10)
 @skipIf(not salt.utils.platform.is_darwin(), 'Test only available on macOS')
 @skipIf(not salt.utils.path.which('systemsetup'), '\'systemsetup\' binary not found in $PATH')
 class MacPowerModuleTest(ModuleCase):
@@ -142,7 +142,7 @@ class MacPowerModuleTest(ModuleCase):
 
 
 @skip_if_not_root
-@flaky
+@flaky(attempts=10)
 @skipIf(not salt.utils.platform.is_darwin(), 'Test only available on macOS')
 @skipIf(not salt.utils.path.which('systemsetup'), '\'systemsetup\' binary not found in $PATH')
 class MacPowerModuleTestSleepOnPowerButton(ModuleCase):
@@ -193,7 +193,7 @@ class MacPowerModuleTestSleepOnPowerButton(ModuleCase):
 
 
 @skip_if_not_root
-@flaky
+@flaky(attempts=10)
 @skipIf(not salt.utils.platform.is_darwin(), 'Test only available on macOS')
 @skipIf(not salt.utils.path.which('systemsetup'), '\'systemsetup\' binary not found in $PATH')
 class MacPowerModuleTestRestartPowerFailure(ModuleCase):
@@ -243,7 +243,7 @@ class MacPowerModuleTestRestartPowerFailure(ModuleCase):
 
 
 @skip_if_not_root
-@flaky
+@flaky(attempts=10)
 @skipIf(not salt.utils.platform.is_darwin(), 'Test only available on macOS')
 @skipIf(not salt.utils.path.which('systemsetup'), '\'systemsetup\' binary not found in $PATH')
 class MacPowerModuleTestWakeOnNet(ModuleCase):
@@ -290,7 +290,7 @@ class MacPowerModuleTestWakeOnNet(ModuleCase):
 
 
 @skip_if_not_root
-@flaky
+@flaky(attempts=10)
 @skipIf(not salt.utils.platform.is_darwin(), 'Test only available on macOS')
 @skipIf(not salt.utils.path.which('systemsetup'), '\'systemsetup\' binary not found in $PATH')
 class MacPowerModuleTestWakeOnModem(ModuleCase):
diff --git a/tests/integration/modules/test_mac_shadow.py b/tests/integration/modules/test_mac_shadow.py
index ac80b6cdf2..396c685256 100644
--- a/tests/integration/modules/test_mac_shadow.py
+++ b/tests/integration/modules/test_mac_shadow.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 '''
-integration tests for mac_system
+integration tests for mac_shadow
 '''
 
 # Import Python libs
@@ -40,7 +40,7 @@ NO_USER = __random_string()
 @skipIf(not salt.utils.path.which('pwpolicy'), '\'pwpolicy\' binary not found in $PATH')
 class MacShadowModuleTest(ModuleCase):
     '''
-    Validate the mac_system module
+    Validate the mac_shadow module
     '''
 
     def setUp(self):
diff --git a/tests/integration/modules/test_mac_system.py b/tests/integration/modules/test_mac_system.py
index cf878de101..522c194367 100644
--- a/tests/integration/modules/test_mac_system.py
+++ b/tests/integration/modules/test_mac_system.py
@@ -34,7 +34,7 @@ SET_SUBNET_NAME = __random_string()
 
 
 @skip_if_not_root
-@flaky(attempts=8)
+@flaky(attempts=10)
 @skipIf(not salt.utils.platform.is_darwin(), 'Test only available on macOS')
 @skipIf(not salt.utils.path.which('systemsetup'), '\'systemsetup\' binary not found in $PATH')
 class MacSystemModuleTest(ModuleCase):
diff --git a/tests/integration/shell/test_matcher.py b/tests/integration/shell/test_matcher.py
index dd936fc626..5ee2954daf 100644
--- a/tests/integration/shell/test_matcher.py
+++ b/tests/integration/shell/test_matcher.py
@@ -153,6 +153,23 @@ class MatchTest(ShellCase, ShellCaseCommonTestsMixin):
         self.assertTrue(minion_in_returns('minion', data))
         self.assertTrue(minion_in_returns('sub_minion', data))
 
+    def test_nodegroup_list(self):
+        data = self.run_salt('-N list_group test.ping')
+        self.assertTrue(minion_in_returns('minion', data))
+        self.assertTrue(minion_in_returns('sub_minion', data))
+
+        data = self.run_salt('-N list_group2 test.ping')
+        self.assertTrue(minion_in_returns('minion', data))
+        self.assertTrue(minion_in_returns('sub_minion', data))
+
+        data = self.run_salt('-N one_list_group test.ping')
+        self.assertTrue(minion_in_returns('minion', data))
+        self.assertFalse(minion_in_returns('sub_minion', data))
+
+        data = self.run_salt('-N one_minion_list test.ping')
+        self.assertTrue(minion_in_returns('minion', data))
+        self.assertFalse(minion_in_returns('sub_minion', data))
+
     def test_glob(self):
         '''
         test salt glob matcher
diff --git a/tests/integration/shell/test_proxy.py b/tests/integration/shell/test_proxy.py
index 4722830e3a..2cef76daf4 100644
--- a/tests/integration/shell/test_proxy.py
+++ b/tests/integration/shell/test_proxy.py
@@ -21,7 +21,6 @@ import salt.utils.platform
 log = logging.getLogger(__name__)
 
 
-@skipIf(salt.utils.platform.is_windows(), 'Skip on Windows OS')
 class ProxyTest(testprogram.TestProgramCase):
     '''
     Various integration tests for the salt-proxy executable.
@@ -30,8 +29,6 @@ class ProxyTest(testprogram.TestProgramCase):
     def test_exit_status_no_proxyid(self):
         '''
         Ensure correct exit status when --proxyid argument is missing.
-
-        Skip on Windows because daemonization not supported
         '''
 
         proxy = testprogram.TestDaemonSaltProxy(
@@ -40,12 +37,14 @@ class ProxyTest(testprogram.TestProgramCase):
         )
         # Call setup here to ensure config and script exist
         proxy.setup()
+        # Needed due to verbatim_args=True
+        args = ['--config-dir', proxy.abs_path(proxy.config_dir)]
+        if not salt.utils.platform.is_windows():
+            args.append('-d')
         stdout, stderr, status = proxy.run(
-            args=[
-                '--config-dir', proxy.abs_path(proxy.config_dir),  # Needed due to verbatim_args=True
-                '-d',
-            ],
-            verbatim_args=True,   # prevents --proxyid from being added automatically
+            args=args,
+            # verbatim_args prevents --proxyid from being added automatically
+            verbatim_args=True,
             catch_stderr=True,
             with_retcode=True,
             # The proxy minion had a bug where it would loop forever
@@ -65,11 +64,13 @@ class ProxyTest(testprogram.TestProgramCase):
             # cause timeout exceptions and respective traceback
             proxy.shutdown()
 
+    # Hangs on Windows. You can add a timeout to the proxy.run command, but then
+    # it just times out.
+    @skipIf(salt.utils.platform.is_windows(), 'Test hangs on Windows')
     def test_exit_status_unknown_user(self):
         '''
-        Ensure correct exit status when the proxy is configured to run as an unknown user.
-
-        Skip on Windows because daemonization not supported
+        Ensure correct exit status when the proxy is configured to run as an
+        unknown user.
         '''
 
         proxy = testprogram.TestDaemonSaltProxy(
@@ -80,7 +81,7 @@ class ProxyTest(testprogram.TestProgramCase):
         # Call setup here to ensure config and script exist
         proxy.setup()
         stdout, stderr, status = proxy.run(
-            args=['-d'],
+            args=['-d'] if not salt.utils.platform.is_windows() else [],
             catch_stderr=True,
             with_retcode=True,
         )
@@ -100,9 +101,8 @@ class ProxyTest(testprogram.TestProgramCase):
     # pylint: disable=invalid-name
     def test_exit_status_unknown_argument(self):
         '''
-        Ensure correct exit status when an unknown argument is passed to salt-proxy.
-
-        Skip on Windows because daemonization not supported
+        Ensure correct exit status when an unknown argument is passed to
+        salt-proxy.
         '''
 
         proxy = testprogram.TestDaemonSaltProxy(
@@ -111,8 +111,11 @@ class ProxyTest(testprogram.TestProgramCase):
         )
         # Call setup here to ensure config and script exist
         proxy.setup()
+        args = ['--unknown-argument']
+        if not salt.utils.platform.is_windows():
+            args.append('-b')
         stdout, stderr, status = proxy.run(
-            args=['-d', '--unknown-argument'],
+            args=args,
             catch_stderr=True,
             with_retcode=True,
         )
@@ -128,13 +131,15 @@ class ProxyTest(testprogram.TestProgramCase):
             # cause timeout exceptions and respective traceback
             proxy.shutdown()
 
+    # Hangs on Windows. You can add a timeout to the proxy.run command, but then
+    # it just times out.
+    @skipIf(salt.utils.platform.is_windows(), 'Test hangs on Windows')
     def test_exit_status_correct_usage(self):
         '''
         Ensure correct exit status when salt-proxy starts correctly.
 
         Skip on Windows because daemonization not supported
         '''
-
         proxy = testprogram.TestDaemonSaltProxy(
             name='proxy-correct_usage',
             parent_dir=self._test_dir,
@@ -142,7 +147,7 @@ class ProxyTest(testprogram.TestProgramCase):
         # Call setup here to ensure config and script exist
         proxy.setup()
         stdout, stderr, status = proxy.run(
-            args=['-d'],
+            args=['-d'] if not salt.utils.platform.is_windows() else [],
             catch_stderr=True,
             with_retcode=True,
         )
diff --git a/tests/integration/utils/testprogram.py b/tests/integration/utils/testprogram.py
index db697072c1..b33ebd5807 100644
--- a/tests/integration/utils/testprogram.py
+++ b/tests/integration/utils/testprogram.py
@@ -399,6 +399,11 @@ class TestProgram(six.with_metaclass(TestProgramMeta, object)):
         cmd_env = dict(os.environ)
         cmd_env.update(env_delta)
 
+        if salt.utils.platform.is_windows() and six.PY2:
+            for k, v in cmd_env.items():
+                if isinstance(k, six.text_type) or isinstance(v, six.text_type):
+                    cmd_env[k.encode('ascii')] = v.encode('ascii')
+
         popen_kwargs = {
             'shell': self.shell,
             'stdout': subprocess.PIPE,
@@ -822,7 +827,8 @@ class TestDaemon(TestProgram):
                     continue
                 except psutils.AccessDenied:
                     # We might get access denied if not running as root
-                    continue
+                    if not salt.utils.platform.is_windows():
+                        raise
                 if any((cmdline == proc_cmdline[n:n + cmd_len])
                         for n in range(len(proc_cmdline) - cmd_len + 1)):
                     ret.append(proc)
diff --git a/tests/support/case.py b/tests/support/case.py
index 5fe4edae7f..27f1434755 100644
--- a/tests/support/case.py
+++ b/tests/support/case.py
@@ -143,7 +143,7 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin):
             os.path.join(RUNTIME_VARS.TMP_CONF_DIR, 'roster'),
             arg_str
         )
-        return self.run_script('salt-ssh', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, raw=True)
+        return self.run_script('salt-ssh', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, raw=True, timeout=timeout)
 
     def run_run(self,
                 arg_str,
@@ -901,12 +901,12 @@ class SyndicCase(TestCase, SaltClientTestCaseMixin):
     '''
     _salt_client_config_file_name_ = 'syndic_master'
 
-    def run_function(self, function, arg=()):
+    def run_function(self, function, arg=(), timeout=90):
         '''
         Run a single salt function and condition the return down to match the
         behavior of the raw function call
         '''
-        orig = self.client.cmd('minion', function, arg, timeout=25)
+        orig = self.client.cmd('minion', function, arg, timeout=timeout)
         if 'minion' not in orig:
             self.skipTest(
                 'WARNING(SHOULD NOT HAPPEN #1935): Failed to get a reply '
diff --git a/tests/unit/modules/test_file.py b/tests/unit/modules/test_file.py
index cc753e7912..3cb1e901c0 100644
--- a/tests/unit/modules/test_file.py
+++ b/tests/unit/modules/test_file.py
@@ -1310,7 +1310,7 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin):
         for mode, err_msg in [(None, 'How to process the file'), ('nonsense', 'Unknown mode')]:
             with pytest.raises(CommandExecutionError) as cmd_err:
                 filemod.line('foo', mode=mode)
-            self.assertIn(err_msg, six.text_type(cmd_err))
+            self.assertIn(err_msg, six.text_type(cmd_err.value))
 
     @patch('os.path.realpath', MagicMock(wraps=lambda x: x))
     @patch('os.path.isfile', MagicMock(return_value=True))
@@ -1323,7 +1323,7 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin):
             with pytest.raises(CommandExecutionError) as cmd_err:
                 filemod.line('foo', mode=mode)
             self.assertIn('Content can only be empty if mode is "delete"',
-                          six.text_type(cmd_err))
+                          six.text_type(cmd_err.value))
 
     @patch('os.path.realpath', MagicMock(wraps=lambda x: x))
     @patch('os.path.isfile', MagicMock(return_value=True))
@@ -1338,7 +1338,7 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin):
             with pytest.raises(CommandExecutionError) as cmd_err:
                 filemod.line('foo', content='test content', mode='insert')
             self.assertIn('"location" or "before/after"',
-                          six.text_type(cmd_err))
+                          six.text_type(cmd_err.value))
 
     def test_util_starts_till(self):
         '''
@@ -1948,7 +1948,7 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin):
                         filemod.line('foo', content=cfg_content, after=_after, before=_before, mode='ensure')
             self.assertIn(
                 'Found more than one line between boundaries "before" and "after"',
-                six.text_type(cmd_err))
+                six.text_type(cmd_err.value))
 
     @with_tempfile()
     def test_line_delete(self, name):
diff --git a/tests/unit/modules/test_localemod.py b/tests/unit/modules/test_localemod.py
index a72613ecd9..fdccb22ca8 100644
--- a/tests/unit/modules/test_localemod.py
+++ b/tests/unit/modules/test_localemod.py
@@ -162,7 +162,7 @@ class LocalemodTestCase(TestCase, LoaderModuleMockMixin):
         '''
         with pytest.raises(CommandExecutionError) as err:
             localemod._localectl_status()
-        assert 'Unable to find "localectl"' in six.text_type(err)
+        assert 'Unable to find "localectl"' in six.text_type(err.value)
         assert not localemod.log.debug.called
 
     @patch('salt.utils.path.which', MagicMock(return_value="/usr/bin/localctl"))
@@ -170,14 +170,14 @@ class LocalemodTestCase(TestCase, LoaderModuleMockMixin):
     def test_localectl_status_parser_empty(self):
         with pytest.raises(CommandExecutionError) as err:
             localemod._localectl_status()
-        assert 'Unable to parse result of "localectl"' in six.text_type(err)
+        assert 'Unable to parse result of "localectl"' in six.text_type(err.value)
 
     @patch('salt.utils.path.which', MagicMock(return_value="/usr/bin/localctl"))
     @patch('salt.modules.localemod.__salt__', {'cmd.run': MagicMock(return_value=locale_ctl_out_broken)})
     def test_localectl_status_parser_broken(self):
         with pytest.raises(CommandExecutionError) as err:
             localemod._localectl_status()
-        assert 'Unable to parse result of "localectl"' in six.text_type(err)
+        assert 'Unable to parse result of "localectl"' in six.text_type(err.value)
 
     @patch('salt.utils.path.which', MagicMock(return_value="/usr/bin/localctl"))
     @patch('salt.modules.localemod.__salt__', {'cmd.run': MagicMock(return_value=locale_ctl_out_structure)})
@@ -295,7 +295,7 @@ class LocalemodTestCase(TestCase, LoaderModuleMockMixin):
         '''
         with pytest.raises(CommandExecutionError) as err:
             localemod.get_locale()
-        assert '"DrunkDragon" is unsupported' in six.text_type(err)
+        assert '"DrunkDragon" is unsupported' in six.text_type(err.value)
 
     @patch('salt.utils.path.which', MagicMock(return_value="/usr/bin/localctl"))
     @patch('salt.modules.localemod.__grains__', {'os_family': 'Ubuntu', 'osmajorrelease': 42})
@@ -398,7 +398,7 @@ class LocalemodTestCase(TestCase, LoaderModuleMockMixin):
         with pytest.raises(CommandExecutionError) as err:
             localemod.set_locale(loc)
         assert not localemod._localectl_set.called
-        assert 'Cannot set locale: "update-locale" was not found.' in six.text_type(err)
+        assert 'Cannot set locale: "update-locale" was not found.' in six.text_type(err.value)
 
     @patch('salt.utils.path.which', MagicMock(return_value=None))
     @patch('salt.modules.localemod.__grains__', {'os_family': 'Gentoo', 'osmajorrelease': 42})
@@ -469,7 +469,7 @@ class LocalemodTestCase(TestCase, LoaderModuleMockMixin):
         '''
         with pytest.raises(CommandExecutionError) as err:
             localemod.set_locale('de_DE.utf8')
-        assert 'Unsupported platform' in six.text_type(err)
+        assert 'Unsupported platform' in six.text_type(err.value)
 
     @patch('salt.utils.locales.normalize_locale', MagicMock(return_value='en_US.UTF-8 UTF-8'))
     @patch('salt.modules.localemod.__salt__', {'locale.list_avail': MagicMock(return_value=['A', 'B'])})
@@ -539,7 +539,7 @@ class LocalemodTestCase(TestCase, LoaderModuleMockMixin):
         '''
         with pytest.raises(CommandExecutionError) as err:
             localemod.gen_locale('de_DE.utf8')
-        assert 'Command "locale-gen" or "localedef" was not found on this system.' in six.text_type(err)
+        assert 'Command "locale-gen" or "localedef" was not found on this system.' in six.text_type(err.value)
 
     def test_gen_locale_debian(self):
         '''
diff --git a/tests/unit/modules/test_win_dism.py b/tests/unit/modules/test_win_dism.py
index 3f2aecb91d..dfd348f604 100644
--- a/tests/unit/modules/test_win_dism.py
+++ b/tests/unit/modules/test_win_dism.py
@@ -9,10 +9,7 @@ import salt.modules.win_dism as dism
 # Import Salt Testing Libs
 from tests.support.mixins import LoaderModuleMockMixin
 from tests.support.unit import TestCase
-from tests.support.mock import (
-    MagicMock,
-    patch
-)
+from tests.support.mock import MagicMock, patch
 
 
 class WinDismTestCase(TestCase, LoaderModuleMockMixin):
@@ -29,7 +26,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
             with patch.dict(dism.__grains__, {'osversion': 10}):
                 dism.add_capability("test")
                 mock.assert_called_once_with(
-                    ['DISM', '/Quiet', '/Online', '/Add-Capability',
+                    [dism.bin_dism, '/Quiet', '/Online', '/Add-Capability',
                      '/CapabilityName:test', '/NoRestart'])
 
     def test_add_capability_with_extras(self):
@@ -41,7 +38,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
             with patch.dict(dism.__grains__, {'osversion': 10}):
                 dism.add_capability("test", "life", True)
                 mock.assert_called_once_with(
-                    ['DISM', '/Quiet', '/Online', '/Add-Capability',
+                    [dism.bin_dism, '/Quiet', '/Online', '/Add-Capability',
                      '/CapabilityName:test', '/Source:life', '/LimitAccess',
                      '/NoRestart'])
 
@@ -54,7 +51,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
             with patch.dict(dism.__grains__, {'osversion': 10}):
                 dism.remove_capability("test")
                 mock.assert_called_once_with(
-                    ['DISM', '/Quiet', '/Online', '/Remove-Capability',
+                    [dism.bin_dism, '/Quiet', '/Online', '/Remove-Capability',
                      '/CapabilityName:test', '/NoRestart'])
 
     def test_get_capabilities(self):
@@ -69,7 +66,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
             with patch.dict(dism.__grains__, {'osversion': 10}):
                 out = dism.get_capabilities()
                 mock.assert_called_once_with(
-                    ['DISM', '/English', '/Online', '/Get-Capabilities'])
+                    [dism.bin_dism, '/English', '/Online', '/Get-Capabilities'])
                 self.assertEqual(out, ['Capa1', 'Capa2'])
 
     def test_installed_capabilities(self):
@@ -84,7 +81,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
             with patch.dict(dism.__grains__, {'osversion': 10}):
                 out = dism.installed_capabilities()
                 mock.assert_called_once_with(
-                    ['DISM', '/English', '/Online', '/Get-Capabilities'])
+                    [dism.bin_dism, '/English', '/Online', '/Get-Capabilities'])
                 self.assertEqual(out, ["Capa1"])
 
     def test_available_capabilities(self):
@@ -99,7 +96,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
             with patch.dict(dism.__grains__, {'osversion': 10}):
                 out = dism.available_capabilities()
                 mock.assert_called_once_with(
-                    ['DISM', '/English', '/Online', '/Get-Capabilities'])
+                    [dism.bin_dism, '/English', '/Online', '/Get-Capabilities'])
                 self.assertEqual(out, ["Capa2"])
 
     def test_add_feature(self):
@@ -110,7 +107,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
         with patch.dict(dism.__salt__, {'cmd.run_all': mock}):
             dism.add_feature("test")
             mock.assert_called_once_with(
-                ['DISM', '/Quiet', '/Online', '/Enable-Feature',
+                [dism.bin_dism, '/Quiet', '/Online', '/Enable-Feature',
                  '/FeatureName:test', '/NoRestart'])
 
     def test_add_feature_with_extras(self):
@@ -121,7 +118,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
         with patch.dict(dism.__salt__, {'cmd.run_all': mock}):
             dism.add_feature('sponge', 'bob', 'C:\\temp', True, True)
             mock.assert_called_once_with(
-                ['DISM', '/Quiet', '/Online', '/Enable-Feature',
+                [dism.bin_dism, '/Quiet', '/Online', '/Enable-Feature',
                  '/FeatureName:sponge', '/PackageName:bob', '/Source:C:\\temp',
                  '/LimitAccess', '/All', '/NoRestart'])
 
@@ -133,7 +130,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
         with patch.dict(dism.__salt__, {'cmd.run_all': mock}):
             dism.remove_feature("test")
             mock.assert_called_once_with(
-                ['DISM', '/Quiet', '/Online', '/Disable-Feature',
+                [dism.bin_dism, '/Quiet', '/Online', '/Disable-Feature',
                  '/FeatureName:test', '/NoRestart'])
 
     def test_remove_feature_with_extras(self):
@@ -144,7 +141,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
         with patch.dict(dism.__salt__, {'cmd.run_all': mock}):
             dism.remove_feature('sponge', True)
             mock.assert_called_once_with(
-                ['DISM', '/Quiet', '/Online', '/Disable-Feature',
+                [dism.bin_dism, '/Quiet', '/Online', '/Disable-Feature',
                  '/FeatureName:sponge', '/Remove', '/NoRestart'])
 
     def test_get_features(self):
@@ -152,12 +149,13 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
             Test getting all the features
         '''
         features = "Feature Name : Capa1\r\n State : Enabled\r\n" \
-                      "Feature Name : Capa2\r\n State : Disabled\r\n"
+                   "Feature Name : Capa2\r\n State : Disabled\r\n"
 
         mock = MagicMock(return_value=features)
         with patch.dict(dism.__salt__, {'cmd.run': mock}):
             out = dism.get_features()
-            mock.assert_called_once_with(['DISM', '/English', '/Online', '/Get-Features'])
+            mock.assert_called_once_with(
+                [dism.bin_dism, '/English', '/Online', '/Get-Features'])
             self.assertEqual(out, ['Capa1', 'Capa2'])
 
     def test_installed_features(self):
@@ -165,12 +163,13 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
             Test getting all the installed features
         '''
         features = "Feature Name : Capa1\r\n State : Enabled\r\n" \
-                      "Feature Name : Capa2\r\n State : Disabled\r\n"
+                   "Feature Name : Capa2\r\n State : Disabled\r\n"
 
         mock = MagicMock(return_value=features)
         with patch.dict(dism.__salt__, {'cmd.run': mock}):
             out = dism.installed_features()
-            mock.assert_called_once_with(['DISM', '/English', '/Online', '/Get-Features'])
+            mock.assert_called_once_with(
+                [dism.bin_dism, '/English', '/Online', '/Get-Features'])
             self.assertEqual(out, ["Capa1"])
 
     def test_available_features(self):
@@ -183,7 +182,8 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
         mock = MagicMock(return_value=features)
         with patch.dict(dism.__salt__, {'cmd.run': mock}):
             out = dism.available_features()
-            mock.assert_called_once_with(['DISM', '/English', '/Online', '/Get-Features'])
+            mock.assert_called_once_with(
+                [dism.bin_dism, '/English', '/Online', '/Get-Features'])
             self.assertEqual(out, ["Capa2"])
 
     def test_add_package(self):
@@ -194,7 +194,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
         with patch.dict(dism.__salt__, {'cmd.run_all': mock}):
             dism.add_package("test")
             mock.assert_called_once_with(
-                ['DISM', '/Quiet', '/Online', '/Add-Package',
+                [dism.bin_dism, '/Quiet', '/Online', '/Add-Package',
                  '/PackagePath:test', '/NoRestart'])
 
     def test_add_package_with_extras(self):
@@ -205,7 +205,7 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
         with patch.dict(dism.__salt__, {'cmd.run_all': mock}):
             dism.add_package('sponge', True, True)
             mock.assert_called_once_with(
-                ['DISM', '/Quiet', '/Online', '/Add-Package',
+                [dism.bin_dism, '/Quiet', '/Online', '/Add-Package',
                  '/PackagePath:sponge', '/IgnoreCheck', '/PreventPending',
                  '/NoRestart'])
 
@@ -217,8 +217,8 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
         with patch.dict(dism.__salt__, {'cmd.run_all': mock}):
             dism.remove_package("test")
             mock.assert_called_once_with(
-                ['DISM', '/Quiet', '/Online', '/Remove-Package', '/NoRestart',
-                 '/PackagePath:test'])
+                [dism.bin_dism, '/Quiet', '/Online', '/Remove-Package',
+                 '/NoRestart', '/PackagePath:test'])
 
     def test_installed_packages(self):
         '''
@@ -230,5 +230,6 @@ class WinDismTestCase(TestCase, LoaderModuleMockMixin):
         mock = MagicMock(return_value=features)
         with patch.dict(dism.__salt__, {'cmd.run': mock}):
             out = dism.installed_packages()
-            mock.assert_called_once_with(['DISM', '/English', '/Online', '/Get-Packages'])
+            mock.assert_called_once_with(
+                [dism.bin_dism, '/English', '/Online', '/Get-Packages'])
             self.assertEqual(out, ['Capa1', 'Capa2'])
diff --git a/tests/unit/modules/test_win_lgpo.py b/tests/unit/modules/test_win_lgpo.py
new file mode 100644
index 0000000000..b666c99e04
--- /dev/null
+++ b/tests/unit/modules/test_win_lgpo.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+'''
+:codeauthor: Shane Lee <slee@saltstack.com>
+'''
+
+# Import Python Libs
+from __future__ import absolute_import, unicode_literals, print_function
+
+# Import Salt Testing Libs
+from tests.support.unit import TestCase
+
+# Import Salt Libs
+import salt.modules.win_lgpo as win_lgpo
+
+
+class WinSystemTestCase(TestCase):
+    '''
+    Test cases for salt.modules.win_lgpo
+    '''
+    encoded_null = chr(0).encode('utf-16-le')
+
+    def test__encode_string(self):
+        '''
+        ``_encode_string`` should return a null terminated ``utf-16-le`` encoded
+        string when a string value is passed
+        '''
+        encoded_value = b''.join(['Salt is awesome'.encode('utf-16-le'),
+                                  self.encoded_null])
+        value = win_lgpo._encode_string('Salt is awesome')
+        self.assertEqual(value, encoded_value)
+
+    def test__encode_string_empty_string(self):
+        '''
+        ``_encode_string`` should return an encoded null when an empty string
+        value is passed
+        '''
+        value = win_lgpo._encode_string('')
+        self.assertEqual(value, self.encoded_null)
+
+    def test__encode_string_error(self):
+        '''
+        ``_encode_string`` should raise an error if a non-string value is passed
+        '''
+        self.assertRaises(TypeError, win_lgpo._encode_string, [1])
+        test_list = ['item1', 'item2']
+        self.assertRaises(TypeError, win_lgpo._encode_string, [test_list])
+        test_dict = {'key1': 'value1', 'key2': 'value2'}
+        self.assertRaises(TypeError, win_lgpo._encode_string, [test_dict])
+
+    def test__encode_string_none(self):
+        '''
+        ``_encode_string`` should return an encoded null when ``None`` is passed
+        '''
+        value = win_lgpo._encode_string(None)
+        self.assertEqual(value, self.encoded_null)
diff --git a/tests/unit/states/test_win_lgpo.py b/tests/unit/states/test_win_lgpo.py
new file mode 100644
index 0000000000..3b184401e3
--- /dev/null
+++ b/tests/unit/states/test_win_lgpo.py
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+'''
+:codeauthor: Shane Lee <slee@saltstack.com>
+'''
+
+# Import Python Libs
+from __future__ import absolute_import, unicode_literals, print_function
+
+# Import Salt Testing Libs
+from tests.support.unit import TestCase
+
+# Import Salt Libs
+import salt.states.win_lgpo as win_lgpo
+
+
+class WinSystemTestCase(TestCase):
+    '''
+    Test cases for the win_lgpo state
+    '''
+
+    def test__compare_policies_string(self):
+        '''
+        ``_compare_policies`` should only return ``True`` when the string values
+        are the same. All other scenarios should return ``False``
+        '''
+        compare_string = 'Salty test'
+        # Same
+        self.assertTrue(
+            win_lgpo._compare_policies(compare_string, compare_string)
+        )
+        # Different
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_string, 'Not the same')
+        )
+        # List
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_string, ['item1', 'item2'])
+        )
+        # Dict
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_string, {'key': 'value'})
+        )
+        # None
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_string, None)
+        )
+
+    def test__compare_policies_list(self):
+        '''
+        ``_compare_policies`` should only return ``True`` when the lists are the
+        same. All other scenarios should return ``False``
+        '''
+        compare_list = ['Salty', 'test']
+        # Same
+        self.assertTrue(
+            win_lgpo._compare_policies(compare_list, compare_list)
+        )
+        # Different
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_list, ['Not', 'the', 'same'])
+        )
+        # String
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_list, 'Not a list')
+        )
+        # Dict
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_list, {'key': 'value'})
+        )
+        # None
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_list, None)
+        )
+
+    def test__compare_policies_dict(self):
+        '''
+        ``_compare_policies`` should only return ``True`` when the dicts are the
+        same. All other scenarios should return ``False``
+        '''
+        compare_dict = {'Salty': 'test'}
+        # Same
+        self.assertTrue(
+            win_lgpo._compare_policies(compare_dict, compare_dict)
+        )
+        # Different
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_dict, {'key': 'value'})
+        )
+        # String
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_dict, 'Not a dict')
+        )
+        # List
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_dict, ['Not', 'a', 'dict'])
+        )
+        # None
+        self.assertFalse(
+            win_lgpo._compare_policies(compare_dict, None)
+        )
diff --git a/tests/unit/utils/test_minions.py b/tests/unit/utils/test_minions.py
index 91c5d28521..3901a786d2 100644
--- a/tests/unit/utils/test_minions.py
+++ b/tests/unit/utils/test_minions.py
@@ -19,6 +19,9 @@ NODEGROUPS = {
     'group2': ['G@foo:bar', 'or', 'web1*'],
     'group3': ['N@group1', 'or', 'N@group2'],
     'group4': ['host4', 'host5', 'host6'],
+    'group5': 'N@group4',
+    'group6': 'N@group3',
+    'group7': ['host1']
 }
 
 EXPECTED = {
@@ -26,6 +29,10 @@ EXPECTED = {
     'group2': ['G@foo:bar', 'or', 'web1*'],
     'group3': ['(', '(', 'L@host1,host2,host3', ')', 'or', '(', 'G@foo:bar', 'or', 'web1*', ')', ')'],
     'group4': ['L@host4,host5,host6'],
+    'group5': ['(', 'L@host4,host5,host6', ')'],
+    'group6': ['(', '(', '(', 'L@host1,host2,host3', ')', 'or', '(',
+               'G@foo:bar', 'or', 'web1*', ')', ')', ')'],
+    'group7': ['L@host1']
 }