Pull up further refactorings related to CONNECTORS-1118 from trunk.

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