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

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