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

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