Merge branch 'maint' into debian-branch

diff --cc misc/mke2fs.conf.in
index a049d61d597fc2f49644ec616be688dfe3b62740,d0066b78b9f75cbfbfb3d784e9252f318851bd05..01e35cf8315007b42a5c78475e776bfac58ad8f6
--- 1/misc/mke2fs.conf.in
--- 2/misc/mke2fs.conf.in
+++ b/misc/mke2fs.conf.in
@@@ -11,14 -11,9 +11,9 @@@
                features = has_journal
        }
        ext4 = {
 -              features = has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize
 +              features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
                inode_size = 256
        }
-       ext4dev = {
-               features = has_journal,extent,huge_file,flex_bg,metadata_csum,inline_data,64bit,dir_nlink,extra_isize
-               inode_size = 256
-               options = test_fs=1
-       }
        small = {
                blocksize = 1024
                inode_size = 128