Merge v2.2 into v2.x

[mongodb-drivers-pr-bot]

Merge new changes from v2.2 into v2.x.

Commits

• Use DBX PR app to create merge-up pull requests (Use DBX PR app to create merge-up pull requests #1972): 27a0d7b

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:

git merge v2.x -m "Resolve conflicts in v2.x"

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:

git reset --hard v2.x
git merge --strategy=ours v2.2 -m "Ignore changes from v2.2"

Then, push the temporary branch to upate the pull request.

[alcaeus]

I had to manually authorise the patch on Evergreen, which I hope is not a regular occurrence but a one-time thing. Other than that this confirms that the work done in #1972 was correct and I'll apply it to our other repos.