Openstack driver rebased on trunk