Merge "Add a test for a broken config on startup" into feature/zuulv3