Reconcile with jb-mr2-release - do not merge

Change-Id: I618d51505419200bc282404ec2af470be97f1fa7
tree: 1bc1480afd3bf2b88b9d0a03f1518e263471ebea
  1. core/
  2. services/