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

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