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

Change-Id: I6be2a4583eae7d7ffa1246316309fc7743396b9c