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