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

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