ensure that printed OrderedDict can be parsed by YAML (like a regular dict)
Merge pull request #7688 from johnnoone/env_finalize

.sls data regression on template rendering