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

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