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

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