am 11f26123: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit '11f2612325a38dadb78d9d23146b57fa3330d00c':
  JZO54D
  JZO54C
  Add make_ext4fs to all builds
  JZO54B
  JRO03V
  JRO03V