#626 - Ensure we're not wiping out solr.xml info on server startup
(Cherry picked from 76d4fef867b60798864277ef1db0832d6317ed98)