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

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