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

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