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