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

Change-Id: I80fa0805a168773ba273726fb4827b6cc24bfb08