Merge mountlist changes from coreutils.