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

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