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

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