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

This reverts commit 05429fb306d3f8705c9bbf3c0a930b69da83b43c.
Rebase from 'upstream' @ version '1.9.40'
Trimmed the branch to only the tools/rostopic sub directory