Reconcile with jb-mr2-release - do not merge

Change-Id: I0497c8b9687906dfa54125cd9298a2474f423e3e