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

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