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

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