SOLR-4935 additional improvements for persisting solr.xml when manipulating cores

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