OCPBUGS-38848: Rebase 4.18 2024-08-29 with fixes#3829

openshift-merge-bot[bot] merged 17 commits into

openshift:mainopenshift/microshift:mainfrom

pmtk:rebase-fix-rebase-4.18.0-0.nightly-2024-08-29-020346_amd64-2024-08-29_arm64-2024-08-28pmtk/microshift:rebase-fix-rebase-4.18.0-0.nightly-2024-08-29-020346_amd64-2024-08-29_arm64-2024-08-28Copy head branch name to clipboard