Reconcile with jb-mr2-release - do not merge

Change-Id: If9501b8a4f0e4a1d6dc787c71457814360d11d2b