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

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