salt-ssh, issue #16129

Address a salt-ssh issue  affecting grains and pillar subsystems.