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

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