[ros-diffs] [royce] 13956: more *nix compatibility fixes