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

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