Reconcile with jb-mr2-release - do not merge

Change-Id: If51129696a3a4c3495ef07f2e74f854a9409013d
tree: 6dc1344943486d5cef8c7d33a57a68bebecf910d
  1. core/
  2. services/