[ros-diffs] [greatlrd] 18715: fix the thrunk so it compiles again after me