[ros-diffs] [tkreuzer] 62106: Another try to fix build