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

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