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

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