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