SOLR-4803: Fixed core discovery mode (ie: new style solr.xml) to treat 'collection1' as the default core name