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

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