Reconcile with jb-mr2-release - do not merge

Change-Id: I0839dac295b83f3c5d53d0bb81925b44e3ec17cc