Fix grains for Amazon and Fedora Remix
Merge pull request #3534 from techhat/grains

Fix grains for Amazon and Fedora Remix