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

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