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