base-files: also apply r36107 to files.old