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

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