Pull up changes from CONNECTORS-1100 branch

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-1100-1x@1638668 13f79535-47bb-0310-9956-ffa450edef68