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

This reverts commit a124ab5774deb18ed737fede9fc885147372e7fa.
Rebase from 'upstream'
Trimmed the branch to only the gazebo_ros sub directory