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

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