Issue #4895: Support grains config for salt
Merge pull request #4896 from analyzere/salt-grains-config

Issue #4895: Support grains config for salt