Merge release/1.17 into release/2.2

[mongodb-drivers-pr-bot]

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

Commits

• GODRIVER-3549 Fix timeouts in CSE custom endpoint test (GODRIVER-3546 Fix timeouts in CSE custom endpoint test #2028) (GODRIVER-3546 Fix timeouts in CSE custom endpoint test (#2028) #2031) (GODRIVER-3549 Fix timeouts in CSE custom endpoint test (#2028) (#2031) #2061): 029da41

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/1.17 

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