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

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