Merge "OpenStack cloud provider support for k8s"