Merge "Add tenant to url formatting." into feature/zuulv3