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

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