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

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