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

This reverts commit 6662b26942e24e408b84a3f765f33574b5baac12.
Rebase from 'upstream'
Trimmed the branch to only the gazebo_ros sub directory