states.saltmod: salt._compat => six
states.file: salt._compat => six
Merge pull request #17879 from hulu/_compat-file-state

states.file: salt._compat => six
Merge pull request #17880 from hulu/_compat-saltmod

states.saltmod: salt._compat => six