Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.36 into main#412

shiftstack-merge-bot[bot] wants to merge 2 commits into

openshift:mainopenshift/cloud-provider-openstack:mainfrom

shiftstack:merge-bot-mainshiftstack/cloud-provider-openstack:merge-bot-mainCopy head branch name to clipboard