[ros-diffs] [sedwards] 17552: minor build fixes for msvc