[ros-diffs] [tfaber] 71878: [SERVMAN] - Fix MSVC build