Merge v1.x into v2.x

.evergreen/config.yml

@@ -23,6 +23,7 @@ post:
   - func: "upload test results"
   - func: "stop mongo-orchestration"
   - func: "stop load balancer"
+  - func: "stop OCSP responder"
   - func: "cleanup"
 
 # These aliases define the default variant/tasks to test for pull requests and merge queue

.evergreen/config/functions.yml

@@ -192,17 +192,23 @@ functions:
           ${PREPARE_SHELL}
           bash ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh
 
-  "run OCSP responder":
-    - command: shell.exec
+  "start OCSP responder":
+    - command: subprocess.exec
       params:
+        binary: bash
+        background: true
         include_expansions_in_env:
-          - TEST_COLUMN
-          - CERT_TYPE
-          - USE_DELEGATE
-        shell: bash
+          - SERVER_TYPE
+          - OCSP_ALGORITHM
+        args:
+          - ${DRIVERS_TOOLS}/.evergreen/ocsp/setup.sh
+
+  "stop OCSP responder":
+    - command: shell.exec
+      params:
         script: |
           ${PREPARE_SHELL}
-          bash ${PROJECT_DIRECTORY}/.evergreen/run-ocsp-responder.sh
+          bash ${DRIVERS_TOOLS}/.evergreen/ocsp/teardown.sh
 
   "run tests":
     - command: shell.exec