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

This reverts commit a6e641331b32efba4389ef4a5dc9f1342c8b6b6e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the ros_controllers sub directory