Pull up fix for CONNECTORS-1100 from trunk, plus upgrade from the CONNECTORS-1100-1x branch

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