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

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