Merge commit Change-Id: I4681c9da28cb3d409309ca80598d6a476e290d17 Signed-off-by: droy <denis.roy@eclipse.org>