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

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