Merge "Remove rest openstack/* repos mappings"