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

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