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