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

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