Reconcile with jb-mr2-release - do not merge

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