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

This reverts commit d8fa18a97a861fe23aee37ba83653d099407f2e4.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the gazebo_ros sub directory