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

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