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

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