Merge "Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15 am: df9b270886  -s ours"