Merge fixes for CONNECTORS-914.

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