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

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