Replace salt utils import with correct salt.utils.files path
Replace salt utils import with correct salt.utils.files path

This fixes a couple of test failures in the develop branch and cleans up
a couple of formatting issues and import ordering.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt