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

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