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

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