Merge "Strip double-timestamps from output log" into feature/zuulv3