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

Change-Id: I498651fc3fa9b021570780e8b8848a806c31962f
tree: c03b26fa8f444a7458a04072b0f874cc4f4e35bb
  1. core/
  2. services/