Merge "Add command socket support to zuul-merger" into feature/zuulv3