Refactor; part of CONNECTORS-885

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1566299 13f79535-47bb-0310-9956-ffa450edef68