am 066c268b: (-s ours) am da068042: Reconcile with jb-mr1-release - do not merge

* commit '066c268bb596d7188091278e92638575765e6e98':
  make_ext4fs: fix dentry padding when dentry size is 4088 or 4092