Merge #16889 with fixes

This should fix the salt-ssh break that #16889 introduces