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

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