Merge branch 'maint' into next

diff --cc configure.in
Simple merge

diff --cc debugfs/set_fields.c
Simple merge

diff --cc e2fsck/recovery.c
Simple merge

diff --cc lib/config.h.in
Simple merge

diff --cc lib/ext2fs/ext2fs.h
Simple merge

diff --cc lib/ext2fs/gen_bitmap64.c
Simple merge