Merge Conflict Resolution (from 10.5.x to master)

[ConfluentJenkins]

What is this pull request?

This is an autogenerated pull request by pint due to a merge conflict failure seen during pint merge.

Next Steps

1. Resolve all conflicts (either via web editor or the command line)
2. Commit merge
3. Obtain approvals from reviewers
4. (IMPORTANT) After obtaining approvals, click the dropdown menu on the merge button and select "Create a merge commit"
5. Click the "Merge pull request" button
6. Re-run pint merge

NOTE: "Create a merge commit" option must be used to ensure all commits from the head branch is added to the base branch.

Questions?

Please reach out to the Developer Productivity team on Slack at #devprod-eng or #devprod-oncall

[cla-assistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ aniketshrimal
✅ janjwerner-confluent
❌ ConfluentJenkins
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[cla-assistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ aniketshrimal
✅ janjwerner-confluent
❌ ConfluentJenkins
_{You have signed the CLA already but the status is still pending? Let us recheck it.}