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

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