Merge "Add tenant support to zuul client" into feature/zuulv3