OCPBUGS-44455: Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.10 into release-4.17#342

openshift-merge-bot[bot] merged 2 commits intoopenshift:release-4.17openshift/cluster-api-provider-openstack:release-4.17from

shiftstack:merge-bot-release-4.17shiftstack/cluster-api-provider-openstack:merge-bot-release-4.17Copy head branch name to clipboard