More CONNECTORS-770 related changes

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