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

Change-Id: I498651fc3fa9b021570780e8b8848a806c31962f