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

Change-Id: If208ee125530792171cc194a9995588cff2bd219