Merge "Add a project index to Tenant" into feature/zuulv3