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

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