Merge "Provide file locations of config syntax errors" into feature/zuulv3