Fix for CONNECTORS-795 and CONNECTORS-821

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