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

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