Merge release/2.1 into release/2.2

[mongodb-drivers-pr-bot]

Merge new changes from release/2.1 into release/2.2.

Commits

• Merge pull request Merge release/2.0 into release/2.1 #2033 from mongodb/merge-release/2.0-into-release/2.1-1746201960453: 2216a17
• Merge branch 'release/2.1' into merge-release/2.0-into-release/2.1-1746201960453: ec61ea0
• GODRIVER-3549 Fix timeouts in CSE custom endpoint test (GODRIVER-3549 Fix timeouts in CSE custom endpoint test #2028) (GODRIVER-3549 Fix timeouts in CSE custom endpoint test (#2028) #2031): f0f3074

Resolving conflicts

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

git merge release/2.2

Ignoring changes

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

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

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