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

This reverts commit 1d170e0735f521caf1ccc20c73ff76f33022581f.
Rebase from 'upstream' @ version '1.9.41'
Trimmed the branch to only the tools/rosmake sub directory