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

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