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

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