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

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