Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch)
Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch)

This is #28210, opened against the 2015.5 branch. This will conflict
when merged forward (into 2015.8) because of the git_pillar rewrite, and
the 2015.8 side of the conflict should be kept in all conflicts.

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