Revert "Trimmed the branch to only the test_nodelet_topic_tools sub directory"

This reverts commit 38cc897b27cf35faf3651726e639f0274464e3f8.
Rebase from 'upstream'
Trimmed the branch to only the test_nodelet_topic_tools sub directory