Merge Conflict Resolution (from 7.9.x to 8.0.x)#2479

semaphore-agent-reader[bot] wants to merge 2 commits into

8.0.xconfluentinc/cp-ansible:8.0.xfrom

pr_merge_from_7_9_x_to_8_0_xconfluentinc/cp-ansible:pr_merge_from_7_9_x_to_8_0_xCopy head branch name to clipboard