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

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