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

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