Reconcile with jb-mr2-release - do not merge

Change-Id: I955b852ca6393278fc537511398e68203b9d428d
tree: 33198e857b2ea238cc749208df0a5d4e66be76ed
  1. tests/