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

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