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

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