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

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