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

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