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

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