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

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