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

This reverts commit b95ed60fc0ed0cb6ba8f6f777c65e160d8c4c8a4.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the tools/rosmake sub directory