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

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