Making salt.states.file python3 compatible
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
Fixing merge conflict
Forgot to remove merge conflict line
Merge pull request #17654 from nmadhok/states-python3-file

Making salt.states.file python3 compatible