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

This reverts commit 6ff2c50b975373c91151712c80532d913fa7b60b.
Rebase from 'upstream'
Trimmed the branch to only the ros_controllers sub directory