roll back most solr changes to asf 4.10 branch