diff --git a/.ci/docs b/.ci/docs
index 269f86ed67..186e254d1e 100644
--- a/.ci/docs
+++ b/.ci/docs
@@ -7,14 +7,17 @@ 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)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // 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)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 def shell_header
 
diff --git a/.ci/kitchen-amazon1-py2 b/.ci/kitchen-amazon1-py2
index aac59d74b9..3e8d7e1742 100644
--- a/.ci/kitchen-amazon1-py2
+++ b/.ci/kitchen-amazon1-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-amazon2-py2 b/.ci/kitchen-amazon2-py2
index 60d1daed45..88f8153661 100644
--- a/.ci/kitchen-amazon2-py2
+++ b/.ci/kitchen-amazon2-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-amazon2-py3 b/.ci/kitchen-amazon2-py3
index a4448ca5eb..0fc78adca2 100644
--- a/.ci/kitchen-amazon2-py3
+++ b/.ci/kitchen-amazon2-py3
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-archlts-py2 b/.ci/kitchen-archlts-py2
index 46602ce153..bd418140e6 100644
--- a/.ci/kitchen-archlts-py2
+++ b/.ci/kitchen-archlts-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-archlts-py3 b/.ci/kitchen-archlts-py3
index b6ae08eb40..5cd76bdf33 100644
--- a/.ci/kitchen-archlts-py3
+++ b/.ci/kitchen-archlts-py3
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos6-py2 b/.ci/kitchen-centos6-py2
index aa80d1d9be..91e6568f54 100644
--- a/.ci/kitchen-centos6-py2
+++ b/.ci/kitchen-centos6-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2
index 85488c94ee..2409641bf0 100644
--- a/.ci/kitchen-centos7-py2
+++ b/.ci/kitchen-centos7-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos7-py2-m2crypto b/.ci/kitchen-centos7-py2-m2crypto
index 2bdd6eb083..15108cca2c 100644
--- a/.ci/kitchen-centos7-py2-m2crypto
+++ b/.ci/kitchen-centos7-py2-m2crypto
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos7-py2-proxy b/.ci/kitchen-centos7-py2-proxy
index 8002486b6c..300cb8f38e 100644
--- a/.ci/kitchen-centos7-py2-proxy
+++ b/.ci/kitchen-centos7-py2-proxy
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos7-py2-pycryptodomex b/.ci/kitchen-centos7-py2-pycryptodomex
index 3206a69722..1cd48f7751 100644
--- a/.ci/kitchen-centos7-py2-pycryptodomex
+++ b/.ci/kitchen-centos7-py2-pycryptodomex
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos7-py2-tcp b/.ci/kitchen-centos7-py2-tcp
index 45f892e1da..8753143106 100644
--- a/.ci/kitchen-centos7-py2-tcp
+++ b/.ci/kitchen-centos7-py2-tcp
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos7-py2-tornado b/.ci/kitchen-centos7-py2-tornado
index b95654d6dd..37cdcbdee4 100644
--- a/.ci/kitchen-centos7-py2-tornado
+++ b/.ci/kitchen-centos7-py2-tornado
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3
index 469c98df50..3afa49d76d 100644
--- a/.ci/kitchen-centos7-py3
+++ b/.ci/kitchen-centos7-py3
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos7-py3-m2crypto b/.ci/kitchen-centos7-py3-m2crypto
index 408aff8ed5..0b65d2ce76 100644
--- a/.ci/kitchen-centos7-py3-m2crypto
+++ b/.ci/kitchen-centos7-py3-m2crypto
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos7-py3-proxy b/.ci/kitchen-centos7-py3-proxy
index b7975c1c79..9bea264195 100644
--- a/.ci/kitchen-centos7-py3-proxy
+++ b/.ci/kitchen-centos7-py3-proxy
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos7-py3-pycryptodomex b/.ci/kitchen-centos7-py3-pycryptodomex
index 86dcdf3072..ba49c10d96 100644
--- a/.ci/kitchen-centos7-py3-pycryptodomex
+++ b/.ci/kitchen-centos7-py3-pycryptodomex
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-centos7-py3-tcp b/.ci/kitchen-centos7-py3-tcp
index 99f84819e1..8a00b17b93 100644
--- a/.ci/kitchen-centos7-py3-tcp
+++ b/.ci/kitchen-centos7-py3-tcp
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-debian10-py3 b/.ci/kitchen-debian10-py3
index 42716eeeab..3559ced2e3 100644
--- a/.ci/kitchen-debian10-py3
+++ b/.ci/kitchen-debian10-py3
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-debian8-py2 b/.ci/kitchen-debian8-py2
index 67253a86cc..59700cf085 100644
--- a/.ci/kitchen-debian8-py2
+++ b/.ci/kitchen-debian8-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-debian9-py2 b/.ci/kitchen-debian9-py2
index 7a05ee29e1..e0d223b697 100644
--- a/.ci/kitchen-debian9-py2
+++ b/.ci/kitchen-debian9-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-debian9-py3 b/.ci/kitchen-debian9-py3
index 358a9640bb..15288600e0 100644
--- a/.ci/kitchen-debian9-py3
+++ b/.ci/kitchen-debian9-py3
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-fedora30-py2 b/.ci/kitchen-fedora30-py2
index dddbd2a1ae..eedb32c890 100644
--- a/.ci/kitchen-fedora30-py2
+++ b/.ci/kitchen-fedora30-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-fedora30-py3 b/.ci/kitchen-fedora30-py3
index 76a1a5df6b..0410dedf8d 100644
--- a/.ci/kitchen-fedora30-py3
+++ b/.ci/kitchen-fedora30-py3
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-macosxhighsierra-py2 b/.ci/kitchen-macosxhighsierra-py2
index 30a63939d0..524a427ac8 100644
--- a/.ci/kitchen-macosxhighsierra-py2
+++ b/.ci/kitchen-macosxhighsierra-py2
@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([
diff --git a/.ci/kitchen-macosxhighsierra-py3 b/.ci/kitchen-macosxhighsierra-py3
index bb3e9fa0d0..2bca5234aa 100644
--- a/.ci/kitchen-macosxhighsierra-py3
+++ b/.ci/kitchen-macosxhighsierra-py3
@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([
diff --git a/.ci/kitchen-macosxmojave-py2 b/.ci/kitchen-macosxmojave-py2
index 18d16705bc..2b9af49b9a 100644
--- a/.ci/kitchen-macosxmojave-py2
+++ b/.ci/kitchen-macosxmojave-py2
@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([
diff --git a/.ci/kitchen-macosxmojave-py3 b/.ci/kitchen-macosxmojave-py3
index afa056c6e7..58fb949d2f 100644
--- a/.ci/kitchen-macosxmojave-py3
+++ b/.ci/kitchen-macosxmojave-py3
@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([
diff --git a/.ci/kitchen-macosxsierra-py2 b/.ci/kitchen-macosxsierra-py2
index 2fb8d3b691..618b80b472 100644
--- a/.ci/kitchen-macosxsierra-py2
+++ b/.ci/kitchen-macosxsierra-py2
@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([
diff --git a/.ci/kitchen-macosxsierra-py3 b/.ci/kitchen-macosxsierra-py3
index 951f0906c9..ea285e299b 100644
--- a/.ci/kitchen-macosxsierra-py3
+++ b/.ci/kitchen-macosxsierra-py3
@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([
diff --git a/.ci/kitchen-opensuse15-py2 b/.ci/kitchen-opensuse15-py2
index 154930d7e6..a923134e94 100644
--- a/.ci/kitchen-opensuse15-py2
+++ b/.ci/kitchen-opensuse15-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-opensuse15-py3 b/.ci/kitchen-opensuse15-py3
index 13945183a3..029f5bd8c0 100644
--- a/.ci/kitchen-opensuse15-py3
+++ b/.ci/kitchen-opensuse15-py3
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1604-py2 b/.ci/kitchen-ubuntu1604-py2
index 36198ba3d6..92b0fb003d 100644
--- a/.ci/kitchen-ubuntu1604-py2
+++ b/.ci/kitchen-ubuntu1604-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1604-py2-m2crypto b/.ci/kitchen-ubuntu1604-py2-m2crypto
index 35abf9ed51..a10336c77d 100644
--- a/.ci/kitchen-ubuntu1604-py2-m2crypto
+++ b/.ci/kitchen-ubuntu1604-py2-m2crypto
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1604-py2-proxy b/.ci/kitchen-ubuntu1604-py2-proxy
index 61c160344e..767066b32b 100644
--- a/.ci/kitchen-ubuntu1604-py2-proxy
+++ b/.ci/kitchen-ubuntu1604-py2-proxy
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1604-py2-pycryptodomex b/.ci/kitchen-ubuntu1604-py2-pycryptodomex
index 29a88d0df1..ed153aa831 100644
--- a/.ci/kitchen-ubuntu1604-py2-pycryptodomex
+++ b/.ci/kitchen-ubuntu1604-py2-pycryptodomex
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1604-py2-tcp b/.ci/kitchen-ubuntu1604-py2-tcp
index 2b5e60b260..f3dd44ecb5 100644
--- a/.ci/kitchen-ubuntu1604-py2-tcp
+++ b/.ci/kitchen-ubuntu1604-py2-tcp
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1604-py2-tornado b/.ci/kitchen-ubuntu1604-py2-tornado
index 2db3b6cbf4..318e89136d 100644
--- a/.ci/kitchen-ubuntu1604-py2-tornado
+++ b/.ci/kitchen-ubuntu1604-py2-tornado
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1604-py3 b/.ci/kitchen-ubuntu1604-py3
index 91f4ed8488..c4f1aeae90 100644
--- a/.ci/kitchen-ubuntu1604-py3
+++ b/.ci/kitchen-ubuntu1604-py3
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1604-py3-m2crypto b/.ci/kitchen-ubuntu1604-py3-m2crypto
index 391147a508..b252781bc6 100644
--- a/.ci/kitchen-ubuntu1604-py3-m2crypto
+++ b/.ci/kitchen-ubuntu1604-py3-m2crypto
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1604-py3-proxy b/.ci/kitchen-ubuntu1604-py3-proxy
index 98cce74313..610c44086b 100644
--- a/.ci/kitchen-ubuntu1604-py3-proxy
+++ b/.ci/kitchen-ubuntu1604-py3-proxy
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1604-py3-pycryptodomex b/.ci/kitchen-ubuntu1604-py3-pycryptodomex
index cb515ab362..989233e66a 100644
--- a/.ci/kitchen-ubuntu1604-py3-pycryptodomex
+++ b/.ci/kitchen-ubuntu1604-py3-pycryptodomex
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1604-py3-tcp b/.ci/kitchen-ubuntu1604-py3-tcp
index adba5242d6..008309a22b 100644
--- a/.ci/kitchen-ubuntu1604-py3-tcp
+++ b/.ci/kitchen-ubuntu1604-py3-tcp
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1804-py2 b/.ci/kitchen-ubuntu1804-py2
index cf49dcbe5e..ee2a7e58bb 100644
--- a/.ci/kitchen-ubuntu1804-py2
+++ b/.ci/kitchen-ubuntu1804-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-ubuntu1804-py3 b/.ci/kitchen-ubuntu1804-py3
index a681e28533..073be7c8c4 100644
--- a/.ci/kitchen-ubuntu1804-py3
+++ b/.ci/kitchen-ubuntu1804-py3
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-windows2016-py2 b/.ci/kitchen-windows2016-py2
index 7ca515dec6..8aa909d922 100644
--- a/.ci/kitchen-windows2016-py2
+++ b/.ci/kitchen-windows2016-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-windows2016-py3 b/.ci/kitchen-windows2016-py3
index fa197ef854..a7ec59965f 100644
--- a/.ci/kitchen-windows2016-py3
+++ b/.ci/kitchen-windows2016-py3
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-windows2019-py2 b/.ci/kitchen-windows2019-py2
index a9a01e12fa..4c88d913b3 100644
--- a/.ci/kitchen-windows2019-py2
+++ b/.ci/kitchen-windows2019-py2
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/kitchen-windows2019-py3 b/.ci/kitchen-windows2019-py3
index 59e7f9aef8..de83da6681 100644
--- a/.ci/kitchen-windows2019-py3
+++ b/.ci/kitchen-windows2019-py3
@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,
diff --git a/.ci/lint b/.ci/lint
index aa12609c40..48c4b7fb4b 100644
--- a/.ci/lint
+++ b/.ci/lint
@@ -10,14 +10,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)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // 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)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 def lint_report_issues = []
 
diff --git a/salt/utils/pkg/rpm.py b/salt/utils/pkg/rpm.py
index 208c2f548f..bc5eb30eda 100644
--- a/salt/utils/pkg/rpm.py
+++ b/salt/utils/pkg/rpm.py
@@ -21,7 +21,7 @@ log = logging.getLogger(__name__)
 # These arches compiled from the rpmUtils.arch python module source
 ARCHES_64 = ('x86_64', 'athlon', 'amd64', 'ia32e', 'ia64', 'geode')
 ARCHES_32 = ('i386', 'i486', 'i586', 'i686')
-ARCHES_PPC = ('ppc', 'ppc64', 'ppc64iseries', 'ppc64pseries')
+ARCHES_PPC = ('ppc', 'ppc64', 'ppc64le', 'ppc64iseries', 'ppc64pseries')
 ARCHES_S390 = ('s390', 's390x')
 ARCHES_SPARC = (
     'sparc', 'sparcv8', 'sparcv9', 'sparcv9v', 'sparc64', 'sparc64v'