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

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