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

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