salt._compat.integer_types => six.integer_types
salt._compat.text_type => six.text_type
modules.config: salt._compat => six
modules.archive: salt._compat => six
modules.lxc: salt._compat => six
salt.utils.validate.user: salt._compat => six
states.cron: salt._compat => six
tests/integration/__init__.py: salt._compat => six
cloud.libcloudfuncs: salt._compat => six
salt/utils/__init__.py: salt._compat => six
salt/renderers/pyobjects.py: salt._compat => six
salt/renderers/pydsl.py: salt._compat => six
salt.modules.{win,}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
Removing lists and change back to earlier
Merge pull request #17867 from hulu/_compat-types

salt._compat.text_type => six.text_type
Merge pull request #17868 from hulu/_compat-config

modules.config: salt._compat => six
Merge pull request #17869 from hulu/_compat-archive

modules.archive: salt._compat => six
Merge pull request #17870 from hulu/_compat-lxc

modules.lxc: salt._compat => six