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

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