Move rebased CONNECTORS-674-2 branch into place

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