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