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