Pull up second half of CONNECTORS-616 fixes to release branch.

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