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