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

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