More fixes for CONNECTORS-1128.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1647577 13f79535-47bb-0310-9956-ffa450edef68