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

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