[ros-diffs] [gvg] 14565: Fix "make bootcd"