Pull up more fixes for CONNECTORS-1061 from trunk

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