Revert "Trimmed the branch to only the tools/rostopic sub directory"

This reverts commit 04deed99628775c2e99435e90473da0b7bf744f2.
Rebase from 'upstream'
Trimmed the branch to only the tools/rostopic sub directory