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

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