Merge in contents of CONNECTORS-911 branch

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