BLC-838 : Don't handle Solr index building inside of one transaction