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

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