UCJEPS-461: additional consolidation of solr and housekeeping code