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

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