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

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