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

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