Merge changes from old CONNECTORS-674 branch

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-674-2@1554202 13f79535-47bb-0310-9956-ffa450edef68