Merge "Remove the rest of users of the old style fstab"