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

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