Pull up fix for CONNECTORS-938 from trunk.

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

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