More CONNECTORS-1077 changes

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