merge in jb-mr1-release history after reset to jb-mr1-dev
tree: c061efeb1d05eea8bda9ecaefc07b45256d36f23
  1. kernel