migrated solr back to ves-ebi-7f
Merge remote-tracking branch 'origin/master'