Reconcile with jb-mr2-release - do not merge

Change-Id: I3f174e8a8e79b7f7ab1ced7ba665c538183948f2
tree: 9e7b0db9a473a08073f75efae2489ebd9217658a
  1. core/
  2. services/