Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I343bd8f6d948c90cd5cede9dc160c86ebce6501c
tree: 21fccb2f0b22b130e7b6d1ba27b5275e3bac2981
  1. core/
  2. services/