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

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