Merge branch 'ppiech/Bug372181' of ssh://git.eclipse.org/gitroot/platform/eclipse.platform.debug into ppiech/Bug372181

Conflicts:
	org.eclipse.debug.ui/META-INF/MANIFEST.MF