[ros-diffs] [hpoussin] 27363: Clean up options between files