Merge release/2.2 into master

[mongodb-drivers-pr-bot]

Merge new changes from release/2.2 into master.

Commits

• Merge pull request Merge release/1.17 into release/2.2 #2063 from mongodb/merge-release/1.17-into-release/2.2-1748445813502: 7272677
• Ignore unmaintained branches when merging up (Ignore unmaintained branches when merging up #2062): 49f0c81

Resolving conflicts

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

git merge master

Ignoring changes

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

git reset --hard master
git merge --strategy=ours release/2.2

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