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

This reverts commit 395092404a8a3aa4a10a5c6326816fe0c84ab50b.
Rebase from 'upstream' @ version '1.7.14'
Trimmed the branch to only the test_nodelet_topic_tools sub directory