Merge "Make checkpointing work on ext4"