Making salt.renderers.yaml python3 compatible
Fix merge conflict
Merge pull request #17786 from nmadhok/renderers-python3-yaml

Making salt.renderers.yaml python3 compatible