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

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