Merge code from CONNECTORS-856 branch

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