Reconcile with jb-mr2-release - do not merge

Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917
tree: 35e63eb4562d505b5bfcea6eb91a1d9ab6d61f74
  1. core/
  2. services/