Bug 577894 - Backport Bug 577341 from 4.22 to 4.6 Change-Id: I1cb454ab0ad3f59c2d21a8c9f10cc8336951b667 Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.debug/+/190084 Tested-by: Sarika Sinha <sarika.sinha@in.ibm.com> Reviewed-by: Sarika Sinha <sarika.sinha@in.ibm.com>