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

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