Pull up the rest of the fixes for CONNECTORS-613 from trunk.

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