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

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