[ros-diffs] [cgutman] 40258: - Fix several handle leaks