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

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