Revert "Trimmed the branch to only the test/test_roscpp sub directory"

This reverts commit 26cada6a8e5a5a245d458123f46089cfa9c3a5ae.
Rebase from 'upstream' @ version '1.9.40'
Trimmed the branch to only the test/test_roscpp sub directory