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

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