Sync from upstream openstack