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

This reverts commit a13dcd8b6fbb55f99880fb8f8815ef1c215be3ca.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the ros_control sub directory