Merge release/2.0 into release/2.1

[mongodb-drivers-pr-bot]

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

Commits

• Merge pull request Merge v1 into release/2.0 #2067 from mongodb/merge-v1-into-release/2.0-1748455609569: a629254
• Merge branch 'release/2.0' into merge-v1-into-release/2.0-1748455609569: 7b0c958
• Merge branch 'release/2.0' into merge-v1-into-release/2.0-1748455609569: 0883fc8
• 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) (GODRIVER-3549 Fix timeouts in CSE custom endpoint test (#2028) (#2031) (#2061) #2066): c40bdfd
• Merge branch 'release/2.0' of github.com:mongodb/mongo-go-driver into release/2.0: ba78e7d
• Revert "GODRIVER-3533 Optimize value reader and writer (GODRIVER-3533 Optimize value reader and writer #2022)": 509ccd4
• GODRIVER-3533 Optimize value reader and writer (GODRIVER-3533 Optimize value reader and writer #2022): faa7fe7

Resolving conflicts

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

git merge release/2.1

Ignoring changes

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

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

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