Apply Abe-san's second patch.

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