[ros-diffs] [tfaber] 53574: [KMTestSuite] - Thank you, SVN, for sucking at merging