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

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