SOLR-5317: SolrCore persistence bugs if defining SolrCores in solr.xml.

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