[Bug 225714] Merge Review: e2fsprogs