Format the variants better, and hopefully order them more logically too

Author: derickr

.evergreen/config.yml

@@ -580,131 +580,131 @@ axes:
     display_name: MongoDB Version
     values:
       - id: "latest"
-        display_name: "latest"
+        display_name: "MongoDB latest"
         variables:
            VERSION: "latest"
       - id: "4.0"
-        display_name: "4.0"
+        display_name: "MongoDB 4.0"
         variables:
            VERSION: "4.0"
       - id: "3.6"
-        display_name: "3.6"
+        display_name: "MongoDB 3.6"
         variables:
            VERSION: "3.6"
       - id: "3.4"
-        display_name: "3.4"
+        display_name: "MongoDB 3.4"
         variables:
            VERSION: "3.4"
       - id: "3.2"
-        display_name: "3.2"
+        display_name: "MongoDB 3.2"
         variables:
            VERSION: "3.2"
       - id: "3.0"
-        display_name: "3.0"
+        display_name: "MongoDB 3.0"
         variables:
            VERSION: "3.0"
 
   - id: php-versions
     display_name: PHP Version
     values:
       - id: "7.2"
-        display_name: "PHP 7.2"
+        display_name: "PHP 7.2"
         variables:
           PHP_VERSION: "7.2.10"
       - id: "7.1"
-        display_name: "PHP 7.1"
+        display_name: "PHP 7.1"
         variables:
           PHP_VERSION: "7.1.22"
       - id: "7.0"
-        display_name: "PHP 7.0"
+        display_name: "PHP 7.0"
         variables:
           PHP_VERSION: "7.0.32"
       - id: "5.6"
-        display_name: "PHP 5.6"
+        display_name: "PHP 5.6"
         variables:
           PHP_VERSION: "5.6.38"
       - id: "5.5"
-        display_name: "PHP 5.5"
+        display_name: "PHP 5.5"
         variables:
           PHP_VERSION: "5.5.38"
 
   - id: os-php5
     display_name: OS
     values:
       - id: ubuntu1604-test
-        display_name: "Ubuntu 16.04"
+        display_name: "Ubuntu 16.04"
         run_on: ubuntu1604-test
       - id: rhel70-test
-        display_name: "RHEL 7.0"
+        display_name: "RHEL 7.0"
         run_on: rhel70
       - id: rhel72-zseries
-        display_name: "RHEL 7.2 zSeries"
+        display_name: "RHEL 7.2 zSeries"
         run_on: rhel72-zseries-test
   - id: os-php7
     display_name: OS
     values:
       - id: debian92-test
-        display_name: "Debian 9.2"
+        display_name: "Debian 9.2"
         run_on: debian92-test
       - id: rhel70-test
-        display_name: "RHEL 7.0"
+        display_name: "RHEL 7.0"
         run_on: rhel70
       - id: rhel72-zseries
-        display_name: "RHEL 7.2 zSeries"
+        display_name: "RHEL 7.2 zSeries"
         run_on: rhel72-zseries-test
 
 buildvariants:
 
 - matrix_name: "tests-php5"
   matrix_spec: {"os-php5": "*", "versions": "4.0", "php-versions": ["5.5", "5.6"] }
-  display_name: "All: ${os-php5}: MongoDB ${versions}/${php-versions}"
+  display_name: "All: ${versions}/${php-versions} (${os-php5}"
   tasks:
      - name: "test-standalone-ssl"
      - name: "test-replicaset-auth"
 
 - matrix_name: "tests-php7"
   matrix_spec: {"os-php7": "*", "versions": "4.0", "php-versions": ["7.0","7.1","7.2"] }
-  display_name: "All: ${os-php7}: MongoDB ${versions}/${php-versions}"
+  display_name: "All: ${versions}/${php-versions} (${os-php7}"
   tasks:
      - name: "test-standalone-ssl"
      - name: "test-replicaset-auth"
 
 
-- matrix_name: "mongo-old-php5"
+- matrix_name: "mongo-30-php5"
   matrix_spec: {"os-php5": "*", "versions": ["3.0", "3.2", "3.4"], "php-versions": "5.6" }
-  display_name: "${os-php5}: MongoDB ${versions}/${php-versions}"
+  display_name: "${versions}/${php-versions} (${os-php5}"
   tasks:
      - name: "test-standalone-old"
      - name: "test-replicaset-old"
 
-- matrix_name: "mongo-old-php7"
+- matrix_name: "mongo-30-php7"
   matrix_spec: {"os-php7": "*", "versions": ["3.0", "3.2", "3.4"], "php-versions": "7.2" }
-  display_name: "${os-php7}: MongoDB ${versions}/PHP ${php-versions}"
+  display_name: "${versions}/${php-versions} (${os-php7}"
   tasks:
      - name: "test-standalone-old"
      - name: "test-replicaset-old"
 
 
-- matrix_name: "mongo-legacy-php5"
+- matrix_name: "mongo-36-php5"
   matrix_spec: {"os-php5": "*", "versions": ["3.6"], "php-versions": "5.6" }
-  display_name: "${os-php5}: MongoDB ${versions}/${php-versions}"
+  display_name: "${versions}/${php-versions} (${os-php5}"
   tasks:
      - name: "test-standalone"
      - name: "test-replicaset"
      - name: "test-replicaset-auth"
 
-- matrix_name: "mongo-legacy-php7"
+- matrix_name: "mongo-36-php7"
   matrix_spec: {"os-php7": "*", "versions": ["3.6"], "php-versions": "7.2" }
-  display_name: "${os-php7}: MongoDB ${versions}/${php-versions}"
+  display_name: "${versions}/${php-versions} (${os-php7}"
   tasks:
      - name: "test-standalone"
      - name: "test-replicaset"
      - name: "test-replicaset-auth"
 
 
-- matrix_name: "mongo-new-php5"
+- matrix_name: "mongo-40-php5"
   matrix_spec: {"os-php5": "*", "versions": ["4.0", "latest"], "php-versions": "5.6" }
-  display_name: "${os-php5}: MongoDB ${versions}/${php-versions}"
+  display_name: "${versions}/${php-versions} (${os-php5}"
   tasks:
      - name: "test-standalone"
      - name: "test-standalone-auth"
@@ -715,9 +715,9 @@ buildvariants:
      - name: "test-sharded"
      - name: "test-sharded-rs"
 
-- matrix_name: "mongo-new-php7"
+- matrix_name: "mongo-40-php7"
   matrix_spec: {"os-php7": "*", "versions": ["4.0", "latest"], "php-versions": "7.2" }
-  display_name: "${os-php7}: MongoDB ${versions}/${php-versions}"
+  display_name: "${versions}/${php-versions} (${os-php7}"
   tasks:
      - name: "test-standalone"
      - name: "test-standalone-auth"