Pull up CONNECTORS-818 changes from the CONNECTORS-818 branch

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