Fix ssh mess

@kongove and @ypu, given that I'm getting problem reports from both your commits, I'm deciding to revert both of those commits. Please let's figure out a better way to getting extra debug info without troubling what is already working in virt-test for so long. Thanks.