Merge pull request #15216 from BKPepe/sshpass-update