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

[basepi]

Refs changes in #11965

[ghost]

Test Failed.

If the failures are unrelated to your code, don't stress, a core developer will know these apart.
In the future, if possible, please branch off a passing commit to avoid false positives.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/3553/

[basepi]

Pretty sure the failure is a fluke. Triggering a new build.

[ghost]

Test Failed.

If the failures are unrelated to your code, don't stress, a core developer will know these apart.
In the future, if possible, please branch off a passing commit to avoid false positives.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/3555/