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

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