Merge "Report YAML parse errors" into feature/zuulv3