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

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