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

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