Reconcile with jb-mr2-release - do not merge

Change-Id: I43fb882425fac784151bbf0a313661f3b684ac89