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

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