git_pillar: fix/cleanup imports

add missing imports
rm unused imports
rename local var to avoid shadowing
Merge pull request #5858 from hulu/git-pillar-import-fix

git_pillar: fix/cleanup imports