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

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