[ros-diffs] [cwittich] 27436: fix some PREfast issues