Ensure that the 'id' grain available to pillar is valid
Merge pull request #12128 from basepi/pillargrains

Ensure that the 'id' grain available to pillar is valid