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