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

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