merge in jb-mr2-release history after reset to jb-mr2-dev
tree: c3f7fe470b6b3e77132624befc4b96ebee54be95
  1. kernel