git_pillar: fix/cleanup imports
git_pillar: fix/cleanup imports

add missing imports
rm unused imports
rename local var to avoid shadowing

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