[ros-diffs] [hyperion] 16137: make SVN merge happy