Merge pull request #8673 from JosJuice/preserve-setting-txt Boot: Do a better job of preserving certain parts of settings.txt
