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

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