Merge "Add support for openstack cloudprovider"