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

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