[ros-diffs] [jimtabor] 14024: Fixup for *nix port