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

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