Making salt.tops.ext_nodes python3 compatible
Making salt.tops.mongo python3 compatible
Making salt.tops.reclass_adapter python3 compatible
Making salt.transport.__init__ python3 compatible
Making salt.wheel.__init__ python3 compatible
Making salt.wheel.config python3 compatible
Making salt.wheel.error python3 compatible
Making salt.wheel.file_roots python3 compatible
Making salt.wheel.key python3 compatible
Making salt.wheel.minions python3 compatible
Making salt.wheel.pillar_roots python3 compatible
Reorganizing import
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
Resolving merge conflict
states.file: salt._compat => six
Making salt.runners.lxc python3 compatible
Merge pull request #17865 from hulu/_compat-int-types

salt._compat.integer_types => six.integer_types