Grains were being set improperly on nodes
Merge pull request #808 from mahendra/grains

Grains were being set improperly on nodes