am c361ae56: am 257fef43: Reconcile with jb-mr1-release - do not merge

* commit 'c361ae56dc7f3909cb9c1adb2af2602bd0428c7b':
  bump version to 4.2.1
  JOP40D