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

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