One bug in that commit was that only one of two the two conditionals
for entering connection reestablishment was considered when
determining if the Folder should close.  This change now uses both
conditionals.  Without this, it's possible for the remote to fail
to open due to connection error and the Folder to remain open although
reestablishment doesn't occur because there's no remote folder to
establish with.