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

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