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

This reverts commit 24458dd08373893b10b70c607f16057deaf991e9.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the tools/rostest sub directory