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

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