[ros-diffs] [fireball] 26023: Merge 26022. rosapps/rostests should build now.