Adding in Windows related core grain code that got removed in merge.
Adding in Windows related core grain code that got removed in merge.

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