Pull up fixes for CONNECTORS-1016 from dev_1x branch

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/release-1.7-branch@1625444 13f79535-47bb-0310-9956-ffa450edef68