SolrJ changes required for FOCUS-4789. SOLR Jira SOLR-5922

(cherry picked from commit e9486bfc3979867ad15c82ebbcf57b4e919b4865)