Openstack fixes

Several fixes for OpenStack CPI.