Fix test failure
Merge branch 'issue_17000' into develop_17000

Conflicts:
	salt/master.py
Making salt.states.file python3 compatible
Making salt.states.pkg python3 compatible
Making salt.states.serverdensity_device python3 compatible
Fix missing import

This fixes #17693
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
Making salt.output.__init__ python3 compatible
Making salt.output.grains python3 compatible
Making salt.output.highstate python3 compatible
Making salt.output.overstatestage python3 compatible
Making salt.output.virt_query python3 compatible
Making salt.pillar.__init__ python3 compatible
Making salt.pillar.hiera python3 compatible
Making salt.pillar.pepa python3 compatible
Making salt.renderers.gpg python3 compatible