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

Change-Id: I6fc072a585767e28d92200cf7b1a5d4859c8fe6a