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

This reverts commit 6dfffa617380a4fb17df3c4d4adc54f3126d6ddc.
Rebase from 'upstream' @ version '1.9.40'
Trimmed the branch to only the tools/rosbag sub directory