Fix for DS-1593 : Ensure discovery.cfg uses 'solr.server' setting
Merge pull request #245 from tdonohue/DS-1593

Fix for DS-1593 : Ensure discovery.cfg uses 'solr.server' setting instead of hardcoding its own URL