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

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