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

This reverts commit 1da52d822497676b982febfbe6312f6e1ec9b5a7.
Rebase from 'upstream'
Trimmed the branch to only the tools/rostest sub directory