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

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