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

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