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

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