[ros-diffs] [hbelusca] 73485: [ROSTESTS]: Sync with trunk r73484.