branch_6x does not build

[Karl Wright]

Problem is the following lines:

>>>>>>
acf30220 solr/core/src/java/org/apache/solr/core/SolrCore.java (Erick
Erickson                2017-04-12 21:55:52 -0700 2835)       if
(coreContainer != null) {
acf30220 solr/core/src/java/org/apache/solr/core/SolrCore.java (Erick
Erickson                2017-04-12 21:55:52 -0700 2836)
lst.add("aliases", coreContainer.getCoreNames(this));
c971f792 solr/core/src/java/org/apache/solr/core/SolrCore.java (Mark Robert
Miller            2012-07-05 20:36:05 +0000 2837)       }
<<<<<<

There is no getCoreNames() method in coreContainer.

Could the perpetrator please fix this as fast as possible?  Thanks!!

Karl