SOLR-4756: Change some of our existing tests to use the new solr.xml format and core discovery by directory structure.
SOLR-4756: Change some of our existing tests to use the new solr.xml format and core discovery by directory structure.

git-svn-id: 308d55f399f3bd9aa0560a10e81a003040006c48@1471545 13f79535-47bb-0310-9956-ffa450edef68

apache/solr,apache/solr,apache/solr,apache/solr,apache/solr