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

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