Pull up fix for CONNECTORS-941 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/release-1.6-branch@1596986 13f79535-47bb-0310-9956-ffa450edef68
Pull up fix for CONNECTORS-940 from trunk

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