Merge release/2.4 into master

[mongodb-drivers-pr-bot]

Merge new changes from release/2.4 into master.

Commits

• GODRIVER-3770 Fix buffer handling in GSSAPI error description and username functions (GODRIVER-3770 Fix buffer handling in GSSAPI error description and username functions  #2297): 0c335e4
• Merge branch 'release/1.17' into release/2.4: 928acda
• BUMP v1.17.7: eb01e7e
• GODRIVER-3766 Remove deprecation notice for `MergeClientOptions` (GODRIVER-3766 Remove deprecation notice for MergeClientOptions #2294): 3c55093
• GODRIVER-3770 Remove libasan from gssapi tests in CI (GODRIVER-3770 Remove libasan from gssapi tests in CI #2293): f6163bf
• GODRIVER-3770 Fix buffer handling in GSSAPI error description and username functions (GODRIVER-3770 Fix buffer handling in GSSAPI error description and username functions #2291): 6798963
• Add more visible deprecation banner to the 1.17 readme (Add more visible deprecation banner to the 1.17 readme #2233): c1e9575

Resolving conflicts

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

git merge master -m "Resolve conflicts in 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.4 -m "Ignore changes from release/2.4"

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