Merge v1.19 into v1.20 (#1649)

Author: alcaeus

.evergreen/config/build-variants.yml

@@ -36,26 +36,26 @@ buildvariants:
     run_on: rhel90-small
     tasks:
       - name: "build-php-openssl3"
-  - name: build-rhel83-zseries
-    display_name: "Build: RHEL 8.3 Zseries"
+  - name: build-rhel8-zseries
+    display_name: "Build: RHEL 8 Zseries"
     tags: ["build", "rhel", "zseries", "tag"]
-    run_on: rhel83-zseries-small
+    run_on: rhel8-zseries-small
     tasks:
       - name: "build-all-php"
-  - name: build-rhel82-arm64
-    display_name: "Build: RHEL 8.2 ARM64"
+  - name: build-rhel8-arm64
+    display_name: "Build: RHEL 8 ARM64"
     tags: ["build", "rhel", "arm64", "tag"]
     run_on: rhel82-arm64
     tasks:
       - name: "build-all-php"
-  - name: build-rhel81-power8
-    display_name: "Build: RHEL 8.1 Power8"
+  - name: build-rhel8-power8
+    display_name: "Build: RHEL 8 Power8"
     tags: ["build", "rhel", "power8", "tag"]
-    run_on: rhel81-power8-large
+    run_on: rhel8-power-large
     tasks:
       - name: "build-all-php"
-  - name: build-rhel80
-    display_name: "Build: RHEL 8.0"
+  - name: build-rhel8
+    display_name: "Build: RHEL 8 x64"
     tags: ["build", "rhel", "x64", "pr", "tag"]
     run_on: rhel80-small
     tasks: