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

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