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

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