Reconcile with jb-mr2-release - do not merge

Change-Id: I0b8102a3962010378a8e19955a38c9cc44bd1c95