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

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