Merge pull request #12959 from SuperSamus/sysconf-dirty-fix Config: Don't depend on `is_dirty` to save SYSCONF during restore