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

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