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

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