Cleaner r2_gazebo package.xml