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

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