- fix and test embedded solr
Merge remote-tracking branch 'origin/master'