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

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