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

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1480515 13f79535-47bb-0310-9956-ffa450edef68