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

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