Fix breakage in salt-ssh
Merge pull request #18072 from cachedout/ssh_grains_fix

Fix breakage in salt-ssh