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

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