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

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