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

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