Merge "Remove unused Tenant.getRepo method" into feature/zuulv3