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

This reverts commit 22ceb1d2ea676c4095b3e268509bc967f7385fe5.
Rebase from 'upstream'
Trimmed the branch to only the tools/rosbag sub directory