[ros-diffs] [cgutman] 48047: [WINSOCK] - Fix branch build