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

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