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

Change-Id: Ide8b4f037be3e7951d4987e93d0a8c355a3b6da9