Reconcile with jb-mr2-release - do not merge

Change-Id: Id3816eec8bf8ceef1883fab3f81803177588eed1
tree: 40b11b88f7fb23e8d07a1e98c996205bd0555f6b
  1. core/
  2. services/