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