SOLR-3251: Wait longer before failing when modified schema doesn't show up right away

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1470686 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4749: Clean up and refactor CoreContainer code around solr.xml and SolrCore management.

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