Improve graceful termination when using ProxyCommand

This commit adds code to wait for a ProxyCommand tunnel to exit when
performing a connection cleanup. Thanks go to Simon Liétar for reporting
this issue and helping to investigate possible solutions.