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