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

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