Merge "Add TenantProjectConfig object" into feature/zuulv3