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

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