Merge "Write inventory as yaml not ini" into feature/zuulv3