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