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

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