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

This reverts commit fb2ec32a257b38e4b3a07ea45d16bc16752e61d5.
Rebase from 'upstream'
Trimmed the branch to only the ros_base sub directory