Bug 577894 - Backport Bug 577341 from 4.22 to 4.7

Change-Id: I510aa4ec1ffb6d8b22812196ad044f99c6e31803
Reviewed-on:
https://git.eclipse.org/r/c/platform/eclipse.platform.debug/+/189162
Tested-by: Sarika Sinha <sarika.sinha@in.ibm.com>
Reviewed-by: Sarika Sinha <sarika.sinha@in.ibm.com>
(cherry picked from commit c5f1e5283d8ed285796215a1347d0b2a6b6d8ea2)
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.debug/+/189019