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

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