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

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