Reconcile with jb-mr2-release - do not merge

Change-Id: I0aa0d8aac380b7cf08b0fcefe06005c7903bf21a