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

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