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

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