Merge "Stop jobs when executor stops" into feature/zuulv3