merge in jb-mr2-release history after reset to jb-mr2-dev
tree: 61011ee861e917f1bd1298adb36acd940f2964bc
  1. core/
  2. services/