[ros-diffs] [tkreuzer] 70461: [GDITOOLS] 3rd try to fix WHS rostests build