merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
tree: 1f23776b45efdf9bb4c28561979d86142927003e
  1. core/
  2. services/
  3. wifi/