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

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