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

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