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

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