Revert the changes just committed; the changes need to be merged rather than just plopped down.

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