Merge "Error on duplicate YAML keys" into feature/zuulv3