Merge "Make sure we always log the exit line" into feature/zuulv3