More work to get things to build again

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