Handle the new FileNotFoundException thrown by embedded solr
Merge branch 'master' into search-1.3.x