Reorganize to really handle stream closing properly

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-1037@1629276 13f79535-47bb-0310-9956-ffa450edef68