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

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