PULL-548: fix reset/close handling, test in Solr