Merge "Make e2fsck depends on badblocks"