Merge v1.21 into v1.x (#1704)

Author: mongodb-php-bot

.evergreen/config.yml

@@ -9,9 +9,9 @@ command_type: system
 # Fail builds when pre tasks fail.
 pre_error_fails_task: true
 
-# Protect ourselves against rogue test case that runs forever. Tasks are killed after 20 minutes, which shouldn't occur
+# Protect ourselves against rogue test case that runs forever. Tasks are killed after 30 minutes, which shouldn't occur
 # under normal circumstances.
-exec_timeout_secs: 1200
+exec_timeout_secs: 1800
 
 # These pre and post rules apply to all tasks not part of a task group, which should only ever be tests against local
 # MongoDB instances. All other tasks that require special preparation should be run from within a task group

.evergreen/config/functions.yml

@@ -158,6 +158,7 @@ functions:
   "bootstrap mongohoused":
     - command: shell.exec
       params:
+        include_expansions_in_env: [AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SESSION_TOKEN]
         script: |
           cd ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake