[MERGE] Make ftp:// a little more resilient for initial push

[Vincent Ladeuil]

>>>>> "john" == John Arbash Meinel <john at arbash-meinel.com> writes:

<snip/>

    john> Because we are doing it with sftp, it seems reasonable to do it for ftp.

+1, just because it remove one difference between ftp and sftp error handling

+2 if you remove the other differences :-)

   Vincent