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

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