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

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