[ros-diffs] [tkreuzer] 51720: [MKHIVE] Merge msvc fixes from cmake branch