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

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