Making salt.output.__init__ python3 compatible
Fix merge conflicts
Merge pull request #17757 from nmadhok/output-python3-__init__

Making salt.output.__init__ python3 compatible