Making salt.output.highstate python3 compatible
Fix merge conflicts
Removing lists and change back to earlier
Merge pull request #17754 from nmadhok/output-python3-highstate

Making salt.output.highstate python3 compatible