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

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