Merge "Don't emit yaml suffixes in run and post-run lines" into feature/zuulv3