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

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