grains.core.saltpath: path -> salt_path, to avoid shadowing same-named func
Merge pull request #5158 from cvrebert/patch-1

grains.core.saltpath: path -> salt_path, to avoid shadowing same-named func