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

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