[ros-diffs] [hpoussin] 17749: Add xml files at the right places