Alexander Marinov Adapted to support Solr 8, code cleanups