merge in jb-mr2-release history after reset to jb-mr2-dev
tree: c0c661eefec298a093d33fd07e8824868148e333
  1. tests/