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

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