More trimming

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

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