Merge pull request #260 from openshift-bot/art-consistency-openshift-4.15-ose-openstack-machine-controllers OCPBUGS-19259: Updating ose-openstack-machine-controllers images to be consistent with ART