Incorporate updates for latest openstack and cmdb