Reconcile with jb-mr2-release - do not merge

Change-Id: Iecd0796991c64c443b80377c3fe211ecd753010f