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

This reverts commit e5ce7eb21065b6ae0ce5b4e2b865b8f2906a8d1c.
Rebase from 'upstream'
Trimmed the branch to only the gazebo_ros_control sub directory