Prevent endless recursion from external pillars
Merge pull request #11144 from techhat/pillar

Prevent endless recursion from external pillars