Revamp fix for CONNECTORS-886.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/solr-4.x/trunk@1571008 13f79535-47bb-0310-9956-ffa450edef68