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

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