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

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