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

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