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

This reverts commit 74db6c4ac58e823cc01ebe23800d20fab40774b3.
Rebase from 'upstream'
Trimmed the branch to only the tools/rosmake sub directory