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

Change-Id: I9f0171d274404b7d138e700fb5043e98bb0aed48