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

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