More work on CONNECTORS-977.

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