WIP: Do Not Merge: Replace tenant_id with segment_id in ip_availability 



depends on #289