Reconcile with jb-mr2-release - do not merge

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