Merge "Return 404 on unknown tenants" into feature/zuulv3