Merge "Handle some common yaml syntax errors" into feature/zuulv3