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

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