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

* commit '257fef430806408dbaca2708018b144d430fbdef':
  bump version to 4.2.1
  JOP40D