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

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