keywrapper: Added -q option
ssh.machine: Switched to keywrapper