Refactoring and i18n fixes -- part of CONNECTORS-899.

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