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

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