[ros-diffs] [jimtabor] 24646: Commit tmp patch by dralnix, fixes Rev 24626 Breaks Linux Build, and windows build.