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

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