More CONNECTORS-1128 fixes

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/release-2.0-branch@1647613 13f79535-47bb-0310-9956-ffa450edef68