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

This reverts commit fa7b81036478ed09d23901c18849282ab94c2a9b.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the gazebo_ros_control sub directory