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

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