Description of problem:
release-4.12 of openshift/cloud-provider-openstack is missing some commits that were backported in upstream project into the release-1.25 branch.
We should import them in our downstream fork.
Steps to Reproduce:
Sync stable branch for CPO release-1.25 into release-4.12