[ros-dev] RE: [ros-diffs] [ea] 16854: Various fixex to make HEAD compile.