Changes to support solr server