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

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