[ros-diffs] [gvg] 21721: Merge Bugzilla-2.20.1