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

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