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

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