Fix problems related to CONNECTORS-1085.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1640169 13f79535-47bb-0310-9956-ffa450edef68
Pull up another CONNECTORS-1085-related fix from trunk, so we can work

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