[ros-diffs] [ion] 13231: Fix svn:ignore problems and remove alignment hacks