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

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