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

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