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