Merge "Restore historical behavior with fsck_msdos (always accept fixes)."