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

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