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

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