SOLR-4910, improvements to persisting solr.xml and misc other fixes, see CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1493618 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4910, corrected typo in CHANGES.txt

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