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

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