Merge "Handle non-syntax errors from Ansible" into feature/zuulv3