Merge "Revert "Revert "Update make_ext4fs_internal param-list to match new implementation""" into nyc-dev