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

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