Merge "Add zuul:var directive and role" into feature/zuulv3