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

This reverts commit 38d3afabd7e5a4a12df35cb8f180616d9b2a9c31.
Rebase from 'upstream'
Trimmed the branch to only the gazebo_ros_control sub directory