Merge changes from topic 'incremental-ext4' into nyc-dev

* changes:
  make_ext4_fs: Clean up a few error messages
  Introduce blk_alloc_to_base_fs utility