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

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