[ros-dev] [ros-diffs] [jgardou] 47802: Merge 47800 from yarotows branch.

[James Tabor]

Jérôme,
Need to go through your commit list and check and see which ones need
to be pushed to the trunk. So far as I see (read), the changes look
good.

Thanks,
James