[ros-diffs] [gvg] 18976: Clean up release branches