Revert "Trimmed the branch to only the gazebo_ros sub directory"

This reverts commit 7d603fb37423ed6a96771416579b49798162f195.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the gazebo_ros sub directory