Fix a couple of bugs doing ZFS restores when using SSH with a password
Merge branch 'master' of github.com:pcbsd/pcbsd