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