Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev