Reconcile with jb-mr2-release - do not merge

Change-Id: I82cfbeb6b54a3bb1225321fb5bb9d57b6ce1d821
tree: 83383548affc90860cac5edcc119b45a12d43cb8
  1. core/
  2. services/