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

This reverts commit bc572adbaa10e9bb885557e7eec0dc7c11cf1162.
Rebase from 'upstream'
Trimmed the branch to only the ros_control sub directory