[ros-diffs] [jimtabor] 62679: - Fix win tests. WIP see r62613.