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

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