Committed 3.diff, with some minor fixes

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