SOLR-7699 Clean up too verbose code in SOLR-7590.
SOLR-6673 MDC based logging of collection, shard etc.