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

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