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

This reverts commit 807546abb05b3accc019900438c5277f5cd47354.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the tools/rosbash sub directory