Reconcile with jb-mr2-release - do not merge

Change-Id: I499f557f51897fdc8fa9c1cab67ee1af4b91ce9d
tree: 61011ee861e917f1bd1298adb36acd940f2964bc
  1. core/
  2. services/