[ros-diffs] [cgutman] 35080: - Fix 2 more memory leaks