Merge "Fix #27 - salt 2018.3 yaml dump to overrides.yml"