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

This reverts commit d672dfb981e3b93bf0ad138a7dc19a7ebf7e3c73.
Rebase from 'upstream'
Trimmed the branch to only the gazebo_ros sub directory