solr-config
Merge pull request #557 from ngds/harvest

solr-config
merge conflicts