Fix custom grain chicken-and-egg issue in highstates

This commit re-gathers pillar data if custom grains were synced during a
highstate.
Merge pull request #7630 from terminalmage/issue5716

Possible fix for custom grain chicken-and-egg issue