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

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