First merge of openstack support