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

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