Merge "mkuserimg_mke2fs: fix issues creating images"