[ros-diffs] [hbelusca] 72939: Fix commit synchronization issue (that's what happens when you work on a patch that somebody else worked on in parallel!!)