SOLR-8333: Several API tweaks so that public APIs were no longer refering to private classes (merge r1717554)