Pull up change for CONNECTORS-1110 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/dev_1x@1640926 13f79535-47bb-0310-9956-ffa450edef68
Pull up fix for CONNECTORS-1111 from trunk.

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