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

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