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

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