Pull up rest of change for CONNECTORS-888 from trunk.

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