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

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