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

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