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

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