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

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