[ros-diffs] [gvg] 17871: Fix some of the damage r17811 did to the GDB stub