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

This reverts commit 05d64143c63c38fbac8ffb874d28f1794ac10535.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the tools/rosout sub directory