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

This reverts commit fdd3c520a614ebf784d55a082a6cf96ed6fb4d06.
Rebase from 'upstream'
Trimmed the branch to only the ros_controllers sub directory