merge in jb-mr1-release history after reset to jb-mr1-dev
tree: 2ccedeefbf6d294313feef38bb2e5c10d26275fe
  1. tests/