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

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