Merge "e2fsck: update encryption support to match upstream"