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

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