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

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