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

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