Merge "Close command socket after sending stop" into feature/zuulv3