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