Merge pull request #60 from SwannCroiset/fix-grains

Fix the heka grains for the aggregator/remote_collector