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

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