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

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